This commit was manufactured by cvs2svn to create tag 'v20110124-1400'. Sprout from master 2011-01-24 11:54:24 UTC Dani Megert <dmgert> 'Replaced wrong usage of "it's" with "its".' Cherrypick from master 2011-01-24 18:04:16 UTC Curtis Windatt <cwindatt> 'Bug 332047: Clicking 'Edit...' on 'Workspace Cannot Be Locked' dialog should select workspace location': ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java Delete: apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/.project apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/license.html apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.classpath apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.cvsignore apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.project apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/about.html apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/build.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/fragmentcdcfoundation10.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.0_Foundation-1.0.zip apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/.project apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/license.html apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.classpath apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.cvsignore apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.project apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/about.html apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/build.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/fragmentcdcfoundation11.properties apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.1_Foundation-1.1.zip apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/.project apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/license.html apitools/org.eclipse.pde.api.tools.ee.j2se12/.classpath apitools/org.eclipse.pde.api.tools.ee.j2se12/.cvsignore apitools/org.eclipse.pde.api.tools.ee.j2se12/.project apitools/org.eclipse.pde.api.tools.ee.j2se12/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.j2se12/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.j2se12/about.html apitools/org.eclipse.pde.api.tools.ee.j2se12/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se12/fragmentj2se12.properties apitools/org.eclipse.pde.api.tools.ee.j2se12/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.2.zip apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/.project apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/license.html apitools/org.eclipse.pde.api.tools.ee.j2se13/.classpath apitools/org.eclipse.pde.api.tools.ee.j2se13/.cvsignore apitools/org.eclipse.pde.api.tools.ee.j2se13/.project apitools/org.eclipse.pde.api.tools.ee.j2se13/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.j2se13/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.j2se13/about.html apitools/org.eclipse.pde.api.tools.ee.j2se13/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se13/fragmentj2se13.properties apitools/org.eclipse.pde.api.tools.ee.j2se13/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.3.zip apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/.project apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/license.html apitools/org.eclipse.pde.api.tools.ee.j2se14/.classpath apitools/org.eclipse.pde.api.tools.ee.j2se14/.cvsignore apitools/org.eclipse.pde.api.tools.ee.j2se14/.project apitools/org.eclipse.pde.api.tools.ee.j2se14/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.j2se14/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.j2se14/about.html apitools/org.eclipse.pde.api.tools.ee.j2se14/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se14/fragmentj2se14.properties apitools/org.eclipse.pde.api.tools.ee.j2se14/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.4.zip apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/.project apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/license.html apitools/org.eclipse.pde.api.tools.ee.j2se15/.classpath apitools/org.eclipse.pde.api.tools.ee.j2se15/.cvsignore apitools/org.eclipse.pde.api.tools.ee.j2se15/.project apitools/org.eclipse.pde.api.tools.ee.j2se15/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.j2se15/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.j2se15/about.html apitools/org.eclipse.pde.api.tools.ee.j2se15/build.properties apitools/org.eclipse.pde.api.tools.ee.j2se15/fragmentj2se15.properties apitools/org.eclipse.pde.api.tools.ee.j2se15/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.5.zip apitools/org.eclipse.pde.api.tools.ee.javase16-feature/.project apitools/org.eclipse.pde.api.tools.ee.javase16-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.javase16-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.javase16-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.javase16-feature/license.html apitools/org.eclipse.pde.api.tools.ee.javase16/.classpath apitools/org.eclipse.pde.api.tools.ee.javase16/.cvsignore apitools/org.eclipse.pde.api.tools.ee.javase16/.project apitools/org.eclipse.pde.api.tools.ee.javase16/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.javase16/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.javase16/about.html apitools/org.eclipse.pde.api.tools.ee.javase16/build.properties apitools/org.eclipse.pde.api.tools.ee.javase16/fragmentjavase16.properties apitools/org.eclipse.pde.api.tools.ee.javase16/src/org/eclipse/pde/api/tools/internal/api_stubs/JavaSE-1.6.zip apitools/org.eclipse.pde.api.tools.ee.jre11-feature/.project apitools/org.eclipse.pde.api.tools.ee.jre11-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.jre11-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.jre11-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.jre11-feature/license.html apitools/org.eclipse.pde.api.tools.ee.jre11/.classpath apitools/org.eclipse.pde.api.tools.ee.jre11/.cvsignore apitools/org.eclipse.pde.api.tools.ee.jre11/.project apitools/org.eclipse.pde.api.tools.ee.jre11/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.jre11/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.jre11/about.html apitools/org.eclipse.pde.api.tools.ee.jre11/build.properties apitools/org.eclipse.pde.api.tools.ee.jre11/fragmentjre11.properties apitools/org.eclipse.pde.api.tools.ee.jre11/src/org/eclipse/pde/api/tools/internal/api_stubs/JRE-1.1.zip apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/.project apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/license.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.classpath apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.cvsignore apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.project apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/about.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/build.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/fragmentosgiminimum10.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.0.zip apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/.project apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/license.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.classpath apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.cvsignore apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.project apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/about.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/build.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/fragmentosgiminimum11.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.1.zip apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/.project apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/build.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/eclipse_update_120.jpg apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/epl-v10.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.xml apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/license.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.classpath apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.cvsignore apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.project apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.settings/org.eclipse.jdt.core.prefs apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/about.html apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/build.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/fragmentosgiminimum12.properties apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip ds/org.eclipse.pde.ds.core/.classpath ds/org.eclipse.pde.ds.core/.cvsignore ds/org.eclipse.pde.ds.core/.project ds/org.eclipse.pde.ds.core/.settings/org.eclipse.core.resources.prefs ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.core.prefs ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.ui.prefs ds/org.eclipse.pde.ds.core/.settings/org.eclipse.pde.prefs ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF ds/org.eclipse.pde.ds.core/about.html ds/org.eclipse.pde.ds.core/build.properties ds/org.eclipse.pde.ds.core/plugin.properties ds/org.eclipse.pde.ds.core/plugin.xml ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Activator.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSComponent.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSConstants.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSDocumentFactory.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSImplementation.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSModel.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSObject.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperties.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperty.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProvide.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSReference.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSService.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Messages.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSJavaHelper.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSMarkerFactory.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DefaultSAXParser.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/XMLErrorReporter.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/messages.properties ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSComponent.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSImplementation.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSModel.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSObject.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperties.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperty.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProvide.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSReference.java ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSService.java ds/org.eclipse.pde.ds.tests/.classpath ds/org.eclipse.pde.ds.tests/.cvsignore ds/org.eclipse.pde.ds.tests/.project ds/org.eclipse.pde.ds.tests/.settings/org.eclipse.jdt.core.prefs ds/org.eclipse.pde.ds.tests/.settings/org.eclipse.jdt.ui.prefs ds/org.eclipse.pde.ds.tests/All DS Tests.launch ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF ds/org.eclipse.pde.ds.tests/about.html ds/org.eclipse.pde.ds.tests/build.properties ds/org.eclipse.pde.ds.tests/plugin.properties ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/Activator.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AllDSModelTests.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSComponentTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSObjectTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertyTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSReferenceTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java ds/org.eclipse.pde.ds.tests/test.xml ds/org.eclipse.pde.ds.ui/.classpath ds/org.eclipse.pde.ds.ui/.cvsignore ds/org.eclipse.pde.ds.ui/.project ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.core.prefs ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.ui.prefs ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.pde.prefs ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF ds/org.eclipse.pde.ds.ui/about.html ds/org.eclipse.pde.ds.ui/build.properties ds/org.eclipse.pde.ds.ui/icons/obj16/attribute_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/class_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/details_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/generic_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/int_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_n_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_one_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/service_obj.gif ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.gif ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.gif ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.png ds/org.eclipse.pde.ds.ui/plugin.properties ds/org.eclipse.pde.ds.ui/plugin.xml ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Activator.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/IConstants.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Messages.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SWTUtil.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SharedImages.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSContentProvider.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditor.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditorContributor.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSFormOutlinePage.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSHyperlinkDetector.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContext.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContextManager.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSLabelProvider.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSOverviewPage.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSServicesPage.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourcePage.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourceViewerConfiguration.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTypeSelectionExtension.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormLayoutFactory.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSAttrCompletionProposal.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypeCompletionProposal.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSProvideSection.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/messages.properties ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/ComboPart.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/FormEntry.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/IFormEntryListener.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewClassCreationWizard.java ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewWizard.java ua/org.eclipse.pde.ua.core/.classpath ua/org.eclipse.pde.ua.core/.cvsignore ua/org.eclipse.pde.ua.core/.project ua/org.eclipse.pde.ua.core/.settings/org.eclipse.core.resources.prefs ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.core.prefs ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.ui.prefs ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.core.prefs ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.prefs ua/org.eclipse.pde.ua.core/META-INF/MANIFEST.MF ua/org.eclipse.pde.ua.core/about.html ua/org.eclipse.pde.ua.core/build.properties ua/org.eclipse.pde.ua.core/plugin.properties ua/org.eclipse.pde.ua.core/plugin.xml ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/Activator.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/CheatSheetUtil.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCS.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDataObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDependency.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSIntro.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModel.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSOnCompletion.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSParam.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTask.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskGroup.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCS.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSAction.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSCommand.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConditionalSubItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConstants.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSDescription.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSHelpObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSIntro.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModel.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModelFactory.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSOnCompletion.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSPerformWhen.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRepeatedSubItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRun.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunContainerObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItemObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCS.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSAction.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSCommand.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSConditionalSubItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDescription.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentTextNode.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSIntro.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSOnCompletion.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSPerformWhen.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRepeatedSubItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRunObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSSubItem.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/ICtxHelpConstants.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpCommand.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpContext.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescription.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescriptionTextNode.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpMarkerManager.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpModel.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpRoot.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpTopic.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/ICSConstants.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCS.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSConstants.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDataObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDependency.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSIntro.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModel.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModelFactory.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSOnCompletion.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSParam.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTask.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskGroup.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/ITocConstants.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/Toc.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocAnchor.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocLink.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocMarkerManager.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocObject.java ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocTopic.java ua/org.eclipse.pde.ua.tests/.classpath ua/org.eclipse.pde.ua.tests/.cvsignore ua/org.eclipse.pde.ua.tests/.project ua/org.eclipse.pde.ua.tests/.settings/org.eclipse.jdt.core.prefs ua/org.eclipse.pde.ua.tests/ALL UA Tests.launch ua/org.eclipse.pde.ua.tests/META-INF/MANIFEST.MF ua/org.eclipse.pde.ua.tests/about.html ua/org.eclipse.pde.ua.tests/build.properties ua/org.eclipse.pde.ua.tests/plugin.properties ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/Activator.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/AllUATests.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AbstractCheatSheetModelTestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AllCheatSheetModelTests.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/CheatSheetModelTestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSIntroTestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemAPITestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemTestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSSpellCheckTestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemAPITestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemTestCase.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/ctxhelp/AllCtxHelpModelTests.java ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/toc/AllTocModelTests.java ua/org.eclipse.pde.ua.ui/.classpath ua/org.eclipse.pde.ua.ui/.cvsignore ua/org.eclipse.pde.ua.ui/.project ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.core.resources.prefs ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.core.prefs ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.ui.prefs ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.core.prefs ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.prefs ua/org.eclipse.pde.ua.ui/META-INF/MANIFEST.MF ua/org.eclipse.pde.ua.ui/about.html ua/org.eclipse.pde.ua.ui/build.properties ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.gif ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.gif ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_command_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_context_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.gif ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.gif ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.png ua/org.eclipse.pde.ua.ui/plugin.properties ua/org.eclipse.pde.ua.ui/plugin.xml ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/IConstants.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceLabelProvider.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPlugin.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPluginImages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractEditor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractSubDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSMaster.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/Messages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSBlock.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSContentProvider.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditorContributor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFileValidator.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFormOutlinePage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContext.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContextManager.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/Messages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/ActionsMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAbstractAddAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddGroupAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddTaskAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSRemoveTaskObjectAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSConclusionTextListener.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSIntroductionTextListener.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskGroupDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/DetailsMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/ISimpleCSCommandKeyListener.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSBlock.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSContentProvider.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditorContributor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSFormOutlinePage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSHyperlinkDetector.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContext.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContextManager.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSSourcePage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleActionMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddStepAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddSubStepAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSPreviewAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveRunObjectAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveStepAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveSubStepAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandComboPart.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSHelpDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleDetailsMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpBlock.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpContentProvider.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpFormOutlinePage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContext.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContextManager.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpSourcePage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpTreeSection.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractAddAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpCommandDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpContextDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDescriptionDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDetailsMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpRemoveAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpTopicDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/HelpEditorUtil.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocBlock.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocContentProvider.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditorContributor.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFileValidator.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFormOutlinePage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHTMLTitleUtil.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContext.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContextManager.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocActionMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddAnchorAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddLinkAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddObjectAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddTopicAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/HelpEditorFilter.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAnchorDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetailsMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocLinkDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocTopicDetails.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/BaseCSCreationOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSFileWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSWizardMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CompCSCreationOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/IRegisterCSData.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCSFileWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCategoryNameDialog.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewSimpleCSFileWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCompCSWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterSimpleCSWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSCreationOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSFileWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/CtxWizardMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/messages.properties ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/IRegisterTOCData.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardMessages.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/messages.properties 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.jdt.core.prefs ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.jdt.ui.prefs 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/LegacyUITestApplication.java ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/NonUIThreadTestApplication.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/.settings/org.eclipse.core.resources.prefs ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.core.prefs ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.launching.prefs ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.ui.prefs ui/org.eclipse.pde.runtime/.settings/org.eclipse.pde.prefs 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/refresh.gif ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.gif ui/org.eclipse.pde.runtime/icons/elcl16/cpyqual_menu.gif ui/org.eclipse.pde.runtime/icons/elcl16/refresh.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/attr_xml_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/bundle-exporter.gif ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer-exporter.gif ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer.gif ui/org.eclipse.pde.runtime/icons/obj16/class_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.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/frgmt_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/int_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/location_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/menu_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/menuspy_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/ok_st_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/package_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/pdespy_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/plugins_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/property_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/save_image_as_obj.gif ui/org.eclipse.pde.runtime/icons/obj16/warning_st_obj.gif ui/org.eclipse.pde.runtime/icons/ovr16/default_co.gif ui/org.eclipse.pde.runtime/icons/ovr16/error_co.gif ui/org.eclipse.pde.runtime/icons/ovr16/export_co.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/MessageHelper.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/pderuntimeresources.properties ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/DiagnosticsDialog.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/RegistryBrowserModelChangeListener.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryFilteredTree.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Attribute.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/BackendChangeListener.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Bundle.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/BundleLibrary.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/BundlePrerequisite.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ConfigurationElement.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Extension.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ExtensionPoint.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Folder.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/LocalRegistryBackend.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ModelChangeDelta.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ModelChangeListener.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ModelObject.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Property.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/RegistryBackend.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/RegistryModel.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/RegistryModelFactory.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ServiceName.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/ServiceRegistration.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyIDEUtil.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/MenuSpyHandler.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/SpyHandler.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveDialogPageSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveFormEditorSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveMenuSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActivePartSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveSelectionSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveShellSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveWizardSection.java ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ISpySection.java ui/org.eclipse.pde.ui.templates/.classpath ui/org.eclipse.pde.ui.templates/.cvsignore ui/org.eclipse.pde.ui.templates/.project ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.core.resources.prefs ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.core.prefs ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.ui.prefs ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.pde.prefs ui/org.eclipse.pde.ui.templates/META-INF/MANIFEST.MF ui/org.eclipse.pde.ui.templates/about.html ui/org.eclipse.pde.ui.templates/branding/bin/splash.bmp ui/org.eclipse.pde.ui.templates/build.properties ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.gif ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.gif ui/org.eclipse.pde.ui.templates/plugin.properties ui/org.eclipse.pde.ui.templates/plugin.xml ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/IHelpContextIds.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/pderesources.properties ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiPreferencesService/java/$activator$.java ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/$activator$.java ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogService.java ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogServiceImpl.java ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/$builderClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/$natureClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/ToggleNatureAction.java ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/bin/icons/read_only.gif ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/bin/icons/sample_decorator.gif ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/java/$decoratorClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/$editorClass$.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/ColorManager.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/IXMLColorConstants.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/NonRuleBasedDamagerRepairer.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/TagRule.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLConfiguration.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLDocumentProvider.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLDoubleClickStrategy.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLPartitionScanner.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLScanner.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLTagScanner.java ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLWhitespaceDetector.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloNonUIRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGi/java/$activator$.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/$activator$.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/Dictionary.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryImpl.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryService.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryServiceImpl.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/component.xml ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/dictionary.xml ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/build.properties ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/$activator$.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/Dictionary.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryImpl.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryService.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryServiceImpl.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/ServiceComponent.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.0/helloWorld/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.0/helloWorld/java/$className$.java ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/concepts/maintopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/concepts/subtopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/concepts/subtopic2.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/gettingstarted/maintopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/gettingstarted/subtopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/gettingstarted/subtopic2.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/maintopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/reference/maintopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/reference/subtopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/reference/subtopic2.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/samples/maintopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/samples/subtopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/samples/subtopic2.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/subtopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/tasks/maintopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/tasks/subtopic.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/tasks/subtopic2.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/toc.html ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocconcepts.xml ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocgettingstarted.xml ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocreference.xml ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocsamples.xml ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/toctasks.xml ui/org.eclipse.pde.ui.templates/templates_3.0/help/testToc.xml ui/org.eclipse.pde.ui.templates/templates_3.0/help/toc.xml ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardPageClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/link_obj.gif ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/titlebanner.gif ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.0/intro/content/root.css ui/org.eclipse.pde.ui.templates/templates_3.0/intro/content/shared.css ui/org.eclipse.pde.ui.templates/templates_3.0/intro/ext.xml ui/org.eclipse.pde.ui.templates/templates_3.0/intro/introContent.xml ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/Application.java ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/DynamicContentProvider.java ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/java/$contributorClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/java/$editorClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/java/$wizardClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/java/$wizardPageClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/perspective/bin/icons/releng_gears.gif ui/org.eclipse.pde.ui.templates/templates_3.0/perspective/java/$perspectiveClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/popupMenus/java/$actionClass$.java ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/$pageClassName$.java ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/PreferenceConstants.java ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/PreferenceInitializer.java ui/org.eclipse.pde.ui.templates/templates_3.0/propertyPages/java/$className$.java ui/org.eclipse.pde.ui.templates/templates_3.0/view/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.0/view/contexts.xml ui/org.eclipse.pde.ui.templates/templates_3.0/view/java/$className$.java ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/View.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/$editorClass$.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/ColorManager.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/IXMLColorConstants.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/TagRule.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLConfiguration.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDocumentProvider.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDoubleClickStrategy.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLPartitionScanner.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLScanner.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLTagScanner.java ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLWhitespaceDetector.java ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_about.gif ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.icns ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.ico ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.xpm ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/content/link_obj.gif ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/content/titlebanner.gif ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/concept1.xhtml ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/concept2.xhtml ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/concept3.xhtml ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/extContent.xhtml ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/root.css ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/root.xhtml ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/shared.css ui/org.eclipse.pde.ui.templates/templates_3.1/intro/ext.xml ui/org.eclipse.pde.ui.templates/templates_3.1/intro/introContent.xml ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/Application.java ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/DynamicContentProvider.java ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/mail.ico ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.icns ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample2.gif ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample3.gif ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/product_lg.gif ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ICommandIds.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/MessagePopupAction.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/NavigationView.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/OpenViewAction.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/View.java ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/View.java ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/css/sample.css ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/sample.xml ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample_hov.gif ui/org.eclipse.pde.ui.templates/templates_3.3/helloNonUIRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_about.gif ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.icns ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.ico ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.xpm ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.3/helloWorldCmd/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.3/helloWorldCmd/java/$className$.java ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/link_obj.gif ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/titlebanner.gif ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/concept1.xhtml ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/concept2.xhtml ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/concept3.xhtml ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/extContent.xhtml ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/root.css ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/root.xhtml ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/shared.css ui/org.eclipse.pde.ui.templates/templates_3.3/intro/ext.xml ui/org.eclipse.pde.ui.templates/templates_3.3/intro/introContent.xml ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/Application.java ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/DynamicContentProvider.java ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/mail.ico ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.gif ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.icns ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample2.gif ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample3.gif ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/product_lg.gif ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ICommandIds.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/MessagePopupAction.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/NavigationView.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/OpenViewAction.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/View.java ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/af.png ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/embedded.png ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/enterprise.png ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/languages.png ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/rcp.png ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/BrowserSplashHandler.java ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/ExtensibleSplashHandler.java ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/InteractiveSplashHandler.java ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/schema/splashExtension.exsd ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_16.gif ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_32.gif ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/$applicationClass$.java ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationActionBarAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationWorkbenchAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/Perspective.java ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/View.java ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/OSGI-INF/component.xml ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/build.properties ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/java/ServiceComponent.java ui/org.eclipse.pde/.classpath ui/org.eclipse.pde/.cvsignore ui/org.eclipse.pde/.project ui/org.eclipse.pde/.settings/org.eclipse.core.resources.prefs ui/org.eclipse.pde/.settings/org.eclipse.jdt.core.prefs ui/org.eclipse.pde/.settings/org.eclipse.jdt.ui.prefs ui/org.eclipse.pde/.settings/org.eclipse.pde.core.prefs ui/org.eclipse.pde/.settings/org.eclipse.pde.prefs ui/org.eclipse.pde/META-INF/MANIFEST.MF ui/org.eclipse.pde/about.html ui/org.eclipse.pde/about.ini ui/org.eclipse.pde/about.mappings ui/org.eclipse.pde/about.properties ui/org.eclipse.pde/build.properties ui/org.eclipse.pde/cheatsheets/helloworld-composite.xml ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-create.xml ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-extension.xml ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-feature.xml ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-install.xml ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-update.xml ui/org.eclipse.pde/cheatsheets/rcpapp-composite.xml ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-create.xml ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-customize.xml ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-export.xml ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-feature-product.xml ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-plugin-product.xml ui/org.eclipse.pde/cheatsheets/setup-apitools-existing-projects.xml ui/org.eclipse.pde/eclipse32.png ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.gif ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48_hov.gif ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.gif ui/org.eclipse.pde/images/topiclabel/sa_samplecube48_hov.gif ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.gif ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48_hov.gif ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.gif ui/org.eclipse.pde/images/topiclabel/tu_createplugin48_hov.gif ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.gif ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48_hov.gif ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.gif ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48_hov.gif ui/org.eclipse.pde/intro/css/overview.css ui/org.eclipse.pde/intro/css/overview.properties ui/org.eclipse.pde/intro/css/samples.css ui/org.eclipse.pde/intro/css/samples.properties ui/org.eclipse.pde/intro/css/tutorials.css ui/org.eclipse.pde/intro/css/tutorials.properties ui/org.eclipse.pde/intro/css/whatsnew.css ui/org.eclipse.pde/intro/css/whatsnew.properties ui/org.eclipse.pde/intro/overviewExtensionContent.xml ui/org.eclipse.pde/intro/samplesExtensionContent.xml ui/org.eclipse.pde/intro/samplesExtensionContent2.xml ui/org.eclipse.pde/intro/tutorialsExtensionContent.xml ui/org.eclipse.pde/intro/whatsnewExtensionContent.xml ui/org.eclipse.pde/plugin.properties ui/org.eclipse.pde/plugin.xml ui/org.eclipse.ui.views.log/.classpath ui/org.eclipse.ui.views.log/.project ui/org.eclipse.ui.views.log/.settings/org.eclipse.core.resources.prefs ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.core.prefs ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.ui.prefs ui/org.eclipse.ui.views.log/.settings/org.eclipse.pde.prefs ui/org.eclipse.ui.views.log/META-INF/MANIFEST.MF ui/org.eclipse.ui.views.log/about.html ui/org.eclipse.ui.views.log/build.properties ui/org.eclipse.ui.views.log/icons/dlcl16/clear.gif ui/org.eclipse.ui.views.log/icons/dlcl16/collapseall.gif ui/org.eclipse.ui.views.log/icons/dlcl16/export_log.gif ui/org.eclipse.ui.views.log/icons/dlcl16/filter_ps.gif ui/org.eclipse.ui.views.log/icons/dlcl16/find_obj.gif ui/org.eclipse.ui.views.log/icons/dlcl16/import_log.gif ui/org.eclipse.ui.views.log/icons/dlcl16/open_log.gif ui/org.eclipse.ui.views.log/icons/dlcl16/properties.gif ui/org.eclipse.ui.views.log/icons/dlcl16/refresh.gif ui/org.eclipse.ui.views.log/icons/dlcl16/remove.gif ui/org.eclipse.ui.views.log/icons/dlcl16/restore_log.gif ui/org.eclipse.ui.views.log/icons/elcl16/clear.gif ui/org.eclipse.ui.views.log/icons/elcl16/collapseall.gif ui/org.eclipse.ui.views.log/icons/elcl16/export_log.gif ui/org.eclipse.ui.views.log/icons/elcl16/filter_ps.gif ui/org.eclipse.ui.views.log/icons/elcl16/find_obj.gif ui/org.eclipse.ui.views.log/icons/elcl16/import_log.gif ui/org.eclipse.ui.views.log/icons/elcl16/open_log.gif ui/org.eclipse.ui.views.log/icons/elcl16/properties.gif ui/org.eclipse.ui.views.log/icons/elcl16/refresh.gif ui/org.eclipse.ui.views.log/icons/elcl16/remove.gif ui/org.eclipse.ui.views.log/icons/elcl16/restore_log.gif ui/org.eclipse.ui.views.log/icons/eview16/error_log.gif ui/org.eclipse.ui.views.log/icons/eview16/event_next.gif ui/org.eclipse.ui.views.log/icons/eview16/event_prev.gif ui/org.eclipse.ui.views.log/icons/obj16/error_st_obj.gif ui/org.eclipse.ui.views.log/icons/obj16/error_stack.gif ui/org.eclipse.ui.views.log/icons/obj16/hierarchical.gif ui/org.eclipse.ui.views.log/icons/obj16/info_st_obj.gif ui/org.eclipse.ui.views.log/icons/obj16/ok_st_obj.gif ui/org.eclipse.ui.views.log/icons/obj16/warning_st_obj.gif ui/org.eclipse.ui.views.log/plugin.properties ui/org.eclipse.ui.views.log/plugin.xml ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/AbstractEntry.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Activator.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialogAction.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/FilterDialog.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Group.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/IHelpContextIds.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ILogFileProvider.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ImportLogAction.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogFilesManager.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogReader.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewContentProvider.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Messages.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenIDELogFileAction.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenLogDialog.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/SharedImages.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/TailInputStream.java ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/messages.properties

commit: 5e087ce74647bf28ce4d0fe96c88b598e7163530 [log] [tgz]
author: cvs2svn <platform-releng-dev@eclipse.org> Mon Jan 24 18:04:17 2011 +0000
committer: cvs2svn <platform-releng-dev@eclipse.org> Mon Jan 24 18:04:17 2011 +0000
tree: 87697b16bdcaea99ce4a605dccb38defd1580fc8
parent: 912b5bf9328e4d6272dea1798ad225e1a8520767 [diff]
diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/.project
deleted file mode 100644
index 6e1f22f..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.properties
deleted file mode 100644
index 6dc29c0..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for CDC-1.0/Foundation-1.0
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-CDC-1.0/Foundation-1.0\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.xml
deleted file mode 100644
index 9c554d2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/feature.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.pde.api.tools.ee.cdcfoundation10_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.cdcfoundation10"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.classpath b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.project b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.project
deleted file mode 100644
index 9c033c1..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.cdcfoundation10</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/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9e6b7db..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:32:16 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/META-INF/MANIFEST.MF
deleted file mode 100644
index 6b497eb..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.cdcfoundation10
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentcdcfoundation10
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/about.html b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/build.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/build.properties
deleted file mode 100644
index 1055e8b..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentcdcfoundation10.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/fragmentcdcfoundation10.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/fragmentcdcfoundation10.properties
deleted file mode 100644
index 45f9d3c..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/fragmentcdcfoundation10.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.0_Foundation-1.0.zip b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.0_Foundation-1.0.zip
deleted file mode 100644
index 33b588d..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.0_Foundation-1.0.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/.project
deleted file mode 100644
index f7e2808..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.properties
deleted file mode 100644
index 1caf191..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for CDC-1.1/Foundation-1.1
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-CDC-1.1/Foundation-1.1\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.xml
deleted file mode 100644
index d80af2b..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/feature.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.pde.api.tools.ee.cdcfoundation11_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.cdcfoundation11"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.classpath b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.project b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.project
deleted file mode 100644
index 01508a5..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.cdcfoundation11</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/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b618df8..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:33:53 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/META-INF/MANIFEST.MF
deleted file mode 100644
index d816336..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.cdcfoundation11
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentcdcfoundation11
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/about.html b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/build.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/build.properties
deleted file mode 100644
index 3536f49..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentcdcfoundation11.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/fragmentcdcfoundation11.properties b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/fragmentcdcfoundation11.properties
deleted file mode 100644
index 51126d3..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/fragmentcdcfoundation11.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.1_Foundation-1.1.zip b/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.1_Foundation-1.1.zip
deleted file mode 100644
index 951ebde..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11/src/org/eclipse/pde/api/tools/internal/api_stubs/CDC-1.1_Foundation-1.1.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/.project
deleted file mode 100644
index f6e4450..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.properties
deleted file mode 100644
index e681de6..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for J2SE-1.2
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-J2SE-1.2\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.xml
deleted file mode 100644
index 2ad8917..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/feature.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature 
-      id="org.eclipse.pde.api.tools.ee.j2se12_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.j2se12"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/.classpath b/apitools/org.eclipse.pde.api.tools.ee.j2se12/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.j2se12/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se12/.project
deleted file mode 100644
index ea5bd18..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.j2se12</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/apitools/org.eclipse.pde.api.tools.ee.j2se12/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.j2se12/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35d6e45..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:26:56 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.j2se12/META-INF/MANIFEST.MF
deleted file mode 100644
index 845661b..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.j2se12
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentj2se12
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/about.html b/apitools/org.eclipse.pde.api.tools.ee.j2se12/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se12/build.properties
deleted file mode 100644
index 66ecdb6..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentj2se12.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/fragmentj2se12.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se12/fragmentj2se12.properties
deleted file mode 100644
index cd4ff75..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/fragmentj2se12.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se12/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.2.zip b/apitools/org.eclipse.pde.api.tools.ee.j2se12/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.2.zip
deleted file mode 100644
index 6adbaf6..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se12/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.2.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/.project
deleted file mode 100644
index 744a4fb..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.properties
deleted file mode 100644
index e344f38..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for J2SE-1.3
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-J2SE-1.3\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.xml
deleted file mode 100644
index de2b115..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/feature.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature 
-      id="org.eclipse.pde.api.tools.ee.j2se13_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.j2se13"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/.classpath b/apitools/org.eclipse.pde.api.tools.ee.j2se13/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.j2se13/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se13/.project
deleted file mode 100644
index 5989d96..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.j2se13</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/apitools/org.eclipse.pde.api.tools.ee.j2se13/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.j2se13/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 01fa8dc..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:25:19 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.j2se13/META-INF/MANIFEST.MF
deleted file mode 100644
index fb94a9b..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.j2se13
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentj2se13
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/about.html b/apitools/org.eclipse.pde.api.tools.ee.j2se13/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se13/build.properties
deleted file mode 100644
index af8c317..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentj2se13.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/fragmentj2se13.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se13/fragmentj2se13.properties
deleted file mode 100644
index 600f206..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/fragmentj2se13.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se13/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.3.zip b/apitools/org.eclipse.pde.api.tools.ee.j2se13/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.3.zip
deleted file mode 100644
index 3705220..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se13/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.3.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/.project
deleted file mode 100644
index e617445..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.properties
deleted file mode 100644
index fcfb7c6..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for J2SE-1.4
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-J2SE-1.4\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.xml
deleted file mode 100644
index 075b20c..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/feature.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature 
-      id="org.eclipse.pde.api.tools.ee.j2se14_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.j2se14"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/.classpath b/apitools/org.eclipse.pde.api.tools.ee.j2se14/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.j2se14/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se14/.project
deleted file mode 100644
index 2310340..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.j2se14</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/apitools/org.eclipse.pde.api.tools.ee.j2se14/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.j2se14/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1465657..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:11:26 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.j2se14/META-INF/MANIFEST.MF
deleted file mode 100644
index 877141e..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.j2se14
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentj2se14
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/about.html b/apitools/org.eclipse.pde.api.tools.ee.j2se14/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se14/build.properties
deleted file mode 100644
index 7ae8498..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentj2se14.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/fragmentj2se14.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se14/fragmentj2se14.properties
deleted file mode 100644
index 16ffe52..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/fragmentj2se14.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se14/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.4.zip b/apitools/org.eclipse.pde.api.tools.ee.j2se14/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.4.zip
deleted file mode 100644
index a15354d..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se14/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.4.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/.project
deleted file mode 100644
index a9ea933..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.properties
deleted file mode 100644
index 96d0fcd..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for J2SE-1.5
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-J2SE-1.5\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.xml
deleted file mode 100644
index cb8ff51..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/feature.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature 
-      id="org.eclipse.pde.api.tools.ee.j2se15_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.j2se15"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/.classpath b/apitools/org.eclipse.pde.api.tools.ee.j2se15/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.j2se15/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/.project b/apitools/org.eclipse.pde.api.tools.ee.j2se15/.project
deleted file mode 100644
index 55a4efe..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.j2se15</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/apitools/org.eclipse.pde.api.tools.ee.j2se15/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.j2se15/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5ed81d5..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:23:20 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.j2se15/META-INF/MANIFEST.MF
deleted file mode 100644
index c195340..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.j2se15
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentj2se15
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/about.html b/apitools/org.eclipse.pde.api.tools.ee.j2se15/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/build.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se15/build.properties
deleted file mode 100644
index 4f1ef14..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentj2se15.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/fragmentj2se15.properties b/apitools/org.eclipse.pde.api.tools.ee.j2se15/fragmentj2se15.properties
deleted file mode 100644
index a2734c5..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/fragmentj2se15.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.j2se15/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.5.zip b/apitools/org.eclipse.pde.api.tools.ee.j2se15/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.5.zip
deleted file mode 100644
index 53ebebb..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.j2se15/src/org/eclipse/pde/api/tools/internal/api_stubs/J2SE-1.5.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/.project
deleted file mode 100644
index 7a2958e..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.properties
deleted file mode 100644
index 417d330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for JavaSE-1.6
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-JavaSE-1.6\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.xml
deleted file mode 100644
index fe3d5a4..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/feature.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature 
-      id="org.eclipse.pde.api.tools.ee.javase16_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.javase16"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/.classpath b/apitools/org.eclipse.pde.api.tools.ee.javase16/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.javase16/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/.project b/apitools/org.eclipse.pde.api.tools.ee.javase16/.project
deleted file mode 100644
index 00ebfd5..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.javase16</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/apitools/org.eclipse.pde.api.tools.ee.javase16/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.javase16/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9604772..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:30:47 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.javase16/META-INF/MANIFEST.MF
deleted file mode 100644
index 90bc313..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.javase16
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentjavase16
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/about.html b/apitools/org.eclipse.pde.api.tools.ee.javase16/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/build.properties b/apitools/org.eclipse.pde.api.tools.ee.javase16/build.properties
deleted file mode 100644
index 9d4db38..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentjavase16.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/fragmentjavase16.properties b/apitools/org.eclipse.pde.api.tools.ee.javase16/fragmentjavase16.properties
deleted file mode 100644
index 6838970..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/fragmentjavase16.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.javase16/src/org/eclipse/pde/api/tools/internal/api_stubs/JavaSE-1.6.zip b/apitools/org.eclipse.pde.api.tools.ee.javase16/src/org/eclipse/pde/api/tools/internal/api_stubs/JavaSE-1.6.zip
deleted file mode 100644
index 7760505..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.javase16/src/org/eclipse/pde/api/tools/internal/api_stubs/JavaSE-1.6.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/.project
deleted file mode 100644
index 8aece58..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.properties
deleted file mode 100644
index 267f605..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for JRE-1.1
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-JRE-1.1.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.xml
deleted file mode 100644
index 08b7277..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/feature.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.pde.api.tools.ee.jre11_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.jre11"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/.classpath b/apitools/org.eclipse.pde.api.tools.ee.jre11/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.jre11/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/.project b/apitools/org.eclipse.pde.api.tools.ee.jre11/.project
deleted file mode 100644
index 971e884..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.jre11</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/apitools/org.eclipse.pde.api.tools.ee.jre11/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.jre11/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 87095c7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:29:00 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.jre11/META-INF/MANIFEST.MF
deleted file mode 100644
index 48ae7dd..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.jre11
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentjre11
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/about.html b/apitools/org.eclipse.pde.api.tools.ee.jre11/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/build.properties b/apitools/org.eclipse.pde.api.tools.ee.jre11/build.properties
deleted file mode 100644
index 1ae6f18..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               fragmentjre11.properties,\
-               about.html

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/fragmentjre11.properties b/apitools/org.eclipse.pde.api.tools.ee.jre11/fragmentjre11.properties
deleted file mode 100644
index d25a674..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/fragmentjre11.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.jre11/src/org/eclipse/pde/api/tools/internal/api_stubs/JRE-1.1.zip b/apitools/org.eclipse.pde.api.tools.ee.jre11/src/org/eclipse/pde/api/tools/internal/api_stubs/JRE-1.1.zip
deleted file mode 100644
index 63f7098..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.jre11/src/org/eclipse/pde/api/tools/internal/api_stubs/JRE-1.1.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/.project
deleted file mode 100644
index 550a18d..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.properties
deleted file mode 100644
index 80248ae..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for OSGi/Minimum-1.0
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-OSGi/Minimum-1.0.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.xml
deleted file mode 100644
index 3ffa4f0..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/feature.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature 
-      id="org.eclipse.pde.api.tools.ee.osgiminimum10_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.osgiminimum10"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.classpath b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.project b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.project
deleted file mode 100644
index a5a2efa..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.osgiminimum10</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/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 981fbcd..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:35:25 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/META-INF/MANIFEST.MF
deleted file mode 100644
index dc15733..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.osgiminimum10
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentosgiminimum10
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/about.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/build.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/build.properties
deleted file mode 100644
index a5f0f6c..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentosgiminimum10.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/fragmentosgiminimum10.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/fragmentosgiminimum10.properties
deleted file mode 100644
index a4e3787..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/fragmentosgiminimum10.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.0.zip b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.0.zip
deleted file mode 100644
index dbf522a..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.0.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/.project
deleted file mode 100644
index e1f834b..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.properties
deleted file mode 100644
index 0582a23..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for OSGi/Minimum-1.1
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-OSGi/Minimum-1.1.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.xml
deleted file mode 100644
index 54af9b3..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/feature.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature 
-      id="org.eclipse.pde.api.tools.ee.osgiminimum11_feature"
-      label="%featureName"
-      version="1.0.1.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.osgiminimum11"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.classpath b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.project b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.project
deleted file mode 100644
index 4301094..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.osgiminimum11</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/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3633c4f..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:36:45 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/META-INF/MANIFEST.MF
deleted file mode 100644
index 095ef72..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.osgiminimum11
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentosgiminimum11
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/about.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/build.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/build.properties
deleted file mode 100644
index 81a093f..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentosgiminimum11.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/fragmentosgiminimum11.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/fragmentosgiminimum11.properties
deleted file mode 100644
index a3d429f..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/fragmentosgiminimum11.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.1.zip b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.1.zip
deleted file mode 100644
index 30f037d..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.1.zip
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/.project b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/.project
deleted file mode 100644
index d9a2e5d..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/.project
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/build.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/build.properties
deleted file mode 100644
index bcb33ad..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/eclipse_update_120.jpg b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/epl-v10.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.properties
deleted file mode 100644
index dba0aba..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.properties
+++ /dev/null

@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Environment Description for OSGi/Minimum-1.2
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=PDE/API Tools Environment Descriptions
-
-# "description" property - description of the feature
-description=This feature provides the description for the execution environment\n\
-OSGi/Minimum-1.2.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=licence.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.xml
deleted file mode 100644
index 4221c4d..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/feature.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.pde.api.tools.ee.osgiminimum12_feature"
-      label="%featureName"
-      version="1.0.3.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ee.osgiminimum12"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-</feature>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/license.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.classpath b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.classpath
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.cvsignore b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.cvsignore
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.project b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.project
deleted file mode 100644
index df7cca4..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.api.tools.ee.osgiminimum12</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/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dbb6dd..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Mon Jan 19 13:38:42 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF
deleted file mode 100644
index d05c067..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.osgiminimum12
-Bundle-Version: 1.0.3.qualifier
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.201"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: fragmentosgiminimum12
-Eclipse-BundleShape: dir

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/about.html b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/about.html
deleted file mode 100644
index 4602330..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/build.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/build.properties
deleted file mode 100644
index daa0e27..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               fragmentosgiminimum12.properties

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/fragmentosgiminimum12.properties b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/fragmentosgiminimum12.properties
deleted file mode 100644
index 24b019b..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/fragmentosgiminimum12.properties
+++ /dev/null

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

diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip
deleted file mode 100644
index 771dea4..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.core/.classpath b/ds/org.eclipse.pde.ds.core/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/ds/org.eclipse.pde.ds.core/.classpath
+++ /dev/null

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

diff --git a/ds/org.eclipse.pde.ds.core/.cvsignore b/ds/org.eclipse.pde.ds.core/.cvsignore
deleted file mode 100644
index 3aef9b8..0000000
--- a/ds/org.eclipse.pde.ds.core/.cvsignore
+++ /dev/null

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

diff --git a/ds/org.eclipse.pde.ds.core/.project b/ds/org.eclipse.pde.ds.core/.project
deleted file mode 100644
index 433722a..0000000
--- a/ds/org.eclipse.pde.ds.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.ds.core</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.core.resources.prefs b/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5441978..0000000
--- a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Wed Mar 26 14:18:10 CDT 2008
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

diff --git a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.core.prefs b/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e94a50f..0000000
--- a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,343 +0,0 @@
-#Thu Mar 19 11:35:18 CDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-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.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-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.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.ui.prefs b/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f3f90a6..0000000
--- a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,109 +0,0 @@
-#Sat May 17 10:19:12 CDT 2008
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=11
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=true
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.pde.prefs b/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 4daf253..0000000
--- a/ds/org.eclipse.pde.ds.core/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,18 +0,0 @@
-#Mon Mar 31 08:52:14 CDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-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/ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
deleted file mode 100644
index a49bce4..0000000
--- a/ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde.ds.core;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.pde.internal.ds.core.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.text;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Export-Package: org.eclipse.pde.internal.ds.core;x-friends:="org.eclipse.pde.ds.ui",
- org.eclipse.pde.internal.ds.core.builders;x-friends:="org.eclipse.pde.ds.ui",
- org.eclipse.pde.internal.ds.core.text;x-friends:="org.eclipse.pde.ds.ui"
-Bundle-Vendor: %providerName

diff --git a/ds/org.eclipse.pde.ds.core/about.html b/ds/org.eclipse.pde.ds.core/about.html
deleted file mode 100644
index 4602330..0000000
--- a/ds/org.eclipse.pde.ds.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ds/org.eclipse.pde.ds.core/build.properties b/ds/org.eclipse.pde.ds.core/build.properties
deleted file mode 100644
index a03857d..0000000
--- a/ds/org.eclipse.pde.ds.core/build.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-src.includes = about.html
\ No newline at end of file

diff --git a/ds/org.eclipse.pde.ds.core/plugin.properties b/ds/org.eclipse.pde.ds.core/plugin.properties
deleted file mode 100644
index 2859591..0000000
--- a/ds/org.eclipse.pde.ds.core/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#Properties file for org.eclipse.pde.ds.core
-pluginName = PDE DS Core
-providerName = Eclipse.org
-
-builders.dsBuilder.name = Declarative Services Builder
-builders.marker.label = Declarative Services Problem
-content-type.name = Service Component File
-

diff --git a/ds/org.eclipse.pde.ds.core/plugin.xml b/ds/org.eclipse.pde.ds.core/plugin.xml
deleted file mode 100644
index 50acf01..0000000
--- a/ds/org.eclipse.pde.ds.core/plugin.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!--
-    Copyright (c) 2008, 2009 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.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>
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-      <content-type
-            base-type="org.eclipse.core.runtime.xml"
-            file-extensions="xml"
-            id="org.eclipse.pde.ds.core.content-type"
-            name="%content-type.name"
-            priority="high">
-         <describer
-               class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
-            <parameter
-                  name="element"
-                  value="{http://www.osgi.org/xmlns/scr/v1.1.0}component">
-            </parameter>
-         </describer>
-      </content-type>
-   </extension>
-
-<!-- ================================================================================= -->
-<!-- Builders 																		   -->
-<!-- ================================================================================= -->
-   
-      <extension
-         id="org.eclipse.pde.ds.core.builder"
-         name="%builders.dsBuilder.name"
-         point="org.eclipse.core.resources.builders">
-      <builder>
-         <run
-               class="org.eclipse.pde.internal.ds.core.builders.DSBuilder">
-         </run>
-      </builder>
-   
-   </extension>
-   
-<!-- ================================================================================= -->
-<!-- Markers                                                                           -->
-<!-- ================================================================================= -->
-   <extension
-         id="problem"
-         name="%builders.marker.label"
-         point="org.eclipse.core.resources.markers">
-      <super type="org.eclipse.core.resources.problemmarker"/>
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="id"/>
-      <attribute name="categoryId"/>
-      <persistent value="true"/>
-   </extension>
-   
-</plugin>

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Activator.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Activator.java
deleted file mode 100644
index 67684e4..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Activator.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.pde.ds.core"; //$NON-NLS-1$
-	
-	// The content type ID
-	public static final String CONTENT_TYPE_ID = "org.eclipse.pde.ds.core.content-type"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-	
-	public static void log(IStatus status) {
-		if (status != null)
-			ResourcesPlugin.getPlugin().getLog().log(status);
-	}
-
-	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 if (e.getMessage() != null) {
-			status = new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, e
-					.getMessage(), e);
-		}
-		log(status);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSComponent.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSComponent.java
deleted file mode 100644
index 3c7d4c5..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSComponent.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 223738
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * A component is a normal Java class contained within a bundle
- * 
- * <component> ::= <implementation> <properties> * <service> ? <reference> *
- */
-public interface IDSComponent extends IDSObject {
-
-	/**
-	 * Sets the value of the attribute name
-	 * 
-	 * @param name
-	 *            New name
-	 */
-	public void setAttributeName(String name);
-
-	/**
-	 * Returns the value of the attribute name
-	 * 
-	 * @return String value of the attribute name
-	 */
-	public String getAttributeName();
-
-	/**
-	 * Sets the value of the attribute enabled
-	 * 
-	 * @param bool
-	 *            boolean value of the attribute enabled.
-	 */
-	public void setEnabled(boolean bool);
-
-	/**
-	 * Returns the value of the attribute enabled
-	 * 
-	 * @return boolean value of the attribute enabled
-	 */
-	public boolean getEnabled();
-
-	/**
-	 * Sets the value of the attribute factory
-	 * 
-	 * @param factory
-	 *            String value of the attribute factory.
-	 */
-	public void setFactory(String factory);
-
-	/**
-	 * Returns the value of the attribute factory
-	 * 
-	 * @return String value of the attribute factory
-	 */
-	public String getFactory();
-
-	/**
-	 * Sets the value of the configuration policy
-	 * 
-	 * @param policy
-	 *            String value of the configuration policy.
-	 */
-	public void setConfigurationPolicy(String policy);
-
-	/**
-	 * Returns the value of the configuration policy
-	 * 
-	 * @return String value of the configuration policy
-	 */
-	public String getConfigurationPolicy();
-
-	/**
-	 * Sets the value of the activate method signature name
-	 * 
-	 * @param name
-	 *            String value of the activate method signature name
-	 */
-	public void setActivateMethod(String name);
-
-	/**
-	 * Returns the value of the activate method signature name
-	 * 
-	 * @return String value of the activate method signature name
-	 */
-	public String getActivateMethod();
-
-	/**
-	 * Sets the value of the deactivate method signature name
-	 * 
-	 * @param name
-	 *            String value of the deactivate method signature name
-	 */
-	public void setDeactivateMethod(String name);
-
-	/**
-	 * Returns the value of the deactivate method signature name
-	 * 
-	 * @return String value of the deactivate method signature name
-	 */
-	public String getDeactivateMethod();
-
-	/**
-	 * Sets the value of the modified method signature name
-	 * 
-	 * @param name
-	 *            String value of the modified method signature name
-	 */
-	public void setModifiedeMethod(String name);
-
-	/**
-	 * Returns the value of the modified method signature name
-	 * 
-	 * @return String value of the modified method signature name
-	 */
-	public String getModifiedMethod();
-
-	/**
-	 * Sets the value of the attribute immediate
-	 * 
-	 * @param bool
-	 *            boolean value of the attribute immediate.
-	 */
-	public void setImmediate(boolean bool);
-
-	/**
-	 * Returns the value of the attribute immediate
-	 * 
-	 * @return boolean value of the attribute immediate
-	 */
-	public boolean getImmediate();
-
-	/**
-	 * Returns the service implementation class
-	 * 
-	 * @return IDSImplementation containing the Implementation element
-	 */
-	public IDSImplementation getImplementation();
-
-	/**
-	 * Returns all Property elements
-	 * 
-	 * @return IDSProperty's array containing all Property elements
-	 */
-	public IDSProperty[] getPropertyElements();
-
-	/**
-	 * Returns all Properties elements
-	 * 
-	 * @return IDSProperties's array containing all Properties elements
-	 */
-	public IDSProperties[] getPropertiesElements();
-
-	/**
-	 * Returns the Service element
-	 * 
-	 * @return IDSService containing the Service element
-	 */
-	public IDSService getService();
-
-	/**
-	 * Returns all Reference elements
-	 * 
-	 * @return IDSReference's array containing all Reference elements
-	 */
-	public IDSReference[] getReferences();
-
-	/**
-	 * Sets the implementation element with information about the component
-	 * implementation class
-	 * 
-	 * 
-	 * @param implementation
-	 *            IDSImplementation object
-	 */
-	public void setImplementation(IDSImplementation implementation);
-
-	/**
-	 * Sets the service element with information to be used when a component
-	 * configuration is to be registered as a service.
-	 * 
-	 * @param service
-	 *            IDSService object
-	 */
-	public void setService(IDSService service);
-
-	/**
-	 * Adds a property element with information about a single property file
-	 * 
-	 * @param property
-	 *            IDSProperty object
-	 */
-	public void addPropertyElement(IDSProperty property);
-
-	/**
-	 * Adds a properties element with information about a set of properties from
-	 * a bundle entry
-	 * 
-	 * @param properties
-	 *            IDSProperties object
-	 * 
-	 */
-	public void addPropertiesElement(IDSProperties properties);
-
-	/**
-	 * Adds a reference element with information about the reference of a bound
-	 * service
-	 * 
-	 * @param reference
-	 *            IDSReference object
-	 */
-	public void addReference(IDSReference reference);
-
-	/**
-	 * Removes a property element
-	 * 
-	 * @param property
-	 *            IDSProperty object
-	 */
-	public void removePropertyElement(IDSProperty property);
-
-	/**
-	 * Removes a properties element
-	 * 
-	 * @param properties
-	 *            IDSProperties object
-	 * 
-	 */
-	public void removePropertiesElement(IDSProperties properties);
-
-	/**
-	 * Removes a reference element
-	 * 
-	 * @param reference
-	 *            IDSReference object
-	 */
-	public void removeReference(IDSReference reference);
-
-	/**
-	 * Removes a service element
-	 * 
-	 * @param service
-	 *            IDSService object
-	 */
-	public void removeService(IDSService service);
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSConstants.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSConstants.java
deleted file mode 100644
index 8b99b49..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSConstants.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * Interface containing constants used for the declarative services editor.
- * 
- * @since 3.4
- */
-public interface IDSConstants {
-
-	public static final String NAMESPACE = "http://www.osgi.org/xmlns/scr/v1.1.0"; //$NON-NLS-1$
-
-	// Elements
-	public static final String ELEMENT_COMPONENT = "component"; //$NON-NLS-1$
-	public static final String ELEMENT_IMPLEMENTATION = "implementation"; //$NON-NLS-1$
-	public static final String ELEMENT_PROPERTIES = "properties"; //$NON-NLS-1$
-	public static final String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$
-	public static final String ELEMENT_SERVICE = "service"; //$NON-NLS-1$
-	public static final String ELEMENT_PROVIDE = "provide"; //$NON-NLS-1$
-	public static final String ELEMENT_REFERENCE = "reference"; //$NON-NLS-1$
-	
-	//Component Attributes
-	public static final String ATTRIBUTE_COMPONENT_NAME = "name"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_COMPONENT_ENABLED = "enabled"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_COMPONENT_FACTORY = "factory"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_COMPONENT_IMMEDIATE = "immediate"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_COMPONENT_CONFIGURATION_POLICY = "configuration-policy"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_COMPONENT_ACTIVATE = "activate"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_COMPONENT_DEACTIVATE = "deactivate"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_COMPONENT_MODIFIED = "modified"; //$NON-NLS-1$
-	
-	//Implementation Attributes
-	public static final String ATTRIBUTE_IMPLEMENTATION_CLASS = "class"; //$NON-NLS-1$
-	
-	//Property Attributes
-	public static final String ATTRIBUTE_PROPERTY_NAME = "name"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_PROPERTY_VALUE = "value"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_PROPERTY_TYPE = "type"; //$NON-NLS-1$
-	
-	
-	//Properties Attributes
-	public static final String ATTRIBUTE_PROPERTIES_ENTRY = "entry"; //$NON-NLS-1$
-	
-	//Service Attributes
-	public static final String ATTRIBUTE_SERVICE_FACTORY = "servicefactory"; //$NON-NLS-1$
-	
-	//Provide Attributes
-	public static final String ATTRIBUTE_PROVIDE_INTERFACE = "interface"; //$NON-NLS-1$
-	
-	//Reference Attributes
-	public static final String ATTRIBUTE_REFERENCE_NAME = "name"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_REFERENCE_INTERFACE = "interface"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_REFERENCE_CARDINALITY = "cardinality"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_REFERENCE_POLICY= "policy"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_REFERENCE_TARGET= "target"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_REFERENCE_BIND= "bind"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_REFERENCE_UNBIND= "unbind"; //$NON-NLS-1$
-		
-	
-	//Types
-	public static final int TYPE_COMPONENT = 0;
-	public static final int TYPE_IMPLEMENTATION = 1;
-	public static final int TYPE_PROPERTIES = 2;
-	public static final int TYPE_PROPERTY = 3;
-	public static final int TYPE_SERVICE = 4;
-	public static final int TYPE_PROVIDE = 5;
-	public static final int TYPE_REFERENCE = 6;
-
-	public static final String VALUE_PROPERTY_TYPE_STRING = "String"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_LONG = "Long"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_FLOAT = "Float"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_DOUBLE = "Double"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_INTEGER = "Integer"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_BYTE = "Byte"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_CHAR = "Character"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_BOOLEAN = "Boolean"; //$NON-NLS-1$
-	public static final String VALUE_PROPERTY_TYPE_SHORT = "Short"; //$NON-NLS-1$
-
-	public static final String VALUE_REFERENCE_POLICY_STATIC = "static"; //$NON-NLS-1$
-	public static final String VALUE_REFERENCE_POLICY_DYNAMIC = "dynamic"; //$NON-NLS-1$
-
-	public static final String VALUE_REFERENCE_CARDINALITY_ZERO_ONE = "0..1"; //$NON-NLS-1$
-	public static final String VALUE_REFERENCE_CARDINALITY_ZERO_N = "0..n"; //$NON-NLS-1$
-	public static final String VALUE_REFERENCE_CARDINALITY_ONE_ONE = "1..1"; //$NON-NLS-1$
-	public static final String VALUE_REFERENCE_CARDINALITY_ONE_N = "1..n"; //$NON-NLS-1$
-	
-	public static final String VALUE_TRUE = "true"; //$NON-NLS-1$
-	public static final String VALUE_FALSE = "false"; //$NON-NLS-1$
-	
-	public static final String VALUE_DEFAULT_TARGET = "(name=value)"; //$NON-NLS-1$
-	
-	public static final String VALUE_CONFIGURATION_POLICY_IGNORE = "ignore"; //$NON-NLS-1$
-	public static final String VALUE_CONFIGURATION_POLICY_OPTIONAL = "optional"; //$NON-NLS-1$
-	public static final String VALUE_CONFIGURATION_POLICY_REQUIRE = "require"; //$NON-NLS-1$
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSDocumentFactory.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSDocumentFactory.java
deleted file mode 100644
index d0baa1d..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSDocumentFactory.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * Handles the creation of document nodes representing the types of elements
- * that can exist in a declarative services xml file.
- * 
- * @since 3.4
- * @see IDSModel
- * @see IDSComponent
- * 
- */
-public interface IDSDocumentFactory {
-
-	/**
-	 * creates a <code>provide</code> element
-	 * 
-	 * @return IDSProvide object, containing the new element
-	 * @see IDSProvide
-	 * @see IDSService
-	 * @see IDSComponent
-	 */
-	public abstract IDSProvide createProvide();
-
-	/**
-	 * creates a <code>property</code> element
-	 * 
-	 * @return IDSProperty object, containing the new element
-	 * @see IDSProperty
-	 * @see IDSComponent
-	 */
-	public abstract IDSProperty createProperty();
-
-
-	/**
-	 * creates a <code>reference</code> element
-	 * 
-	 * @return IDSReference object, containing the new element
-	 * @see IDSReference
-	 * @see IDSComponent
-	 */
-	public abstract IDSReference createReference();
-
-	/**
-	 * creates a <code>service</code> element
-	 * 
-	 * @return IDSService object, containing the new element
-	 * @see IDSService
-	 * @see IDSComponent
-	 */
-	public abstract IDSService createService();
-
-	/**
-	 * creates a <code>properties</code> element
-	 * 
-	 * @return IDSProperties object, containing the new element
-	 * @see IDSProperties
-	 * @see IDSComponent
-	 */
-	public abstract IDSProperties createProperties();
-
-	/**
-	 * creates a <code>implementation</code> element
-	 * 
-	 * @return IDSImplementation object, containing the new element
-	 * @see IDSImplementation
-	 * @see IDSComponent
-	 */
-	public abstract IDSImplementation createImplementation();
-
-	/**
-	 * creates a <code>component</code> element
-	 * 
-	 * @return IDSComponent object, containing the new element
-	 * @see IDSComponent
-	 */
-	public abstract IDSComponent createComponent();
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSImplementation.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSImplementation.java
deleted file mode 100644
index f117888..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSImplementation.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * Represents the component implementation class
- * 
- * @since 3.4
- * @see IDSComponent
- * @see IDSObject
- * 
- */
-public interface IDSImplementation extends IDSObject {
-
-	/**
-	 * Sets the java fully qualified name of the implementation class.
-	 * 
-	 * @param className
-	 *            new java fully qualified name
-	 */
-	public void setClassName(String className);
-
-	/**
-	 * Returns the java fully qualified name of the implementation class.
-	 * 
-	 * @return String containing the java fully qualified name
-	 */
-	public String getClassName();
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSModel.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSModel.java
deleted file mode 100644
index 59cdd70..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSModel.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738 
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangeProvider;
-
-/**
- * Represents the DS Text Model
- * 
- * @since 3.4
- * @see IDSComponent
- * @see IDSFactory
- */
-public interface IDSModel extends IModelChangeProvider, IModel {
-
-	/**
-	 * Return the factory object of this model
-	 * 
-	 * @return existing IDSDocumentfactory object, or create a new object for
-	 *         the first time it is called
-	 */
-	public abstract IDSDocumentFactory getFactory();
-
-	/**
-	 * Return the root component element of this model
-	 * 
-	 * @return existing IDSComponent object, or create a new object for the
-	 *         first time it is called
-	 */
-	public abstract IDSComponent getDSComponent();
-
-	/**
-	 * Sets a workspace resource that this model is created from. Load/reload
-	 * operations are not directly connected with the resource (although they
-	 * can be). In some cases, models will load from a buffer (an editor
-	 * document) rather than a resource. However, the buffer will eventually be
-	 * synced up with this resource.
-	 * <p>
-	 * With the caveat of stepped loading, all other properties of the
-	 * underlying resource could be used directly (path, project etc.).
-	 * 
-	 * @param resource
-	 *            a workspace resource (file) that this model is associated
-	 *            with.
-	 */
-	public abstract void setUnderlyingResource(IResource resource);
-
-	/**
-	 * Saves the model into the underlying resource
-	 * 
-	 */
-	public abstract void save();
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSObject.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSObject.java
deleted file mode 100644
index 6ac62ee..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSObject.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-import org.eclipse.pde.internal.core.text.IDocumentObject;
-
-/**
- * Represents a general DS element of a DS xml file.
- * 
- */
-public interface IDSObject extends IDocumentObject {
-
-	/**
-	 * Returns the model object of this object.
-	 * 
-	 * @return IDSModel object containing the model.
-	 */
-	public abstract IDSModel getModel();
-
-	/**
-	 * Returns the root element that is an ancestor to this object.
-	 * 
-	 * @return IDSComponent object containing the root element.
-	 */
-	public abstract IDSComponent getComponent();
-
-	/**
-	 * Returns the identifier for this object to be used when displaying the
-	 * element to the user
-	 * 
-	 * @return String containing the identifier
-	 */
-	public abstract String getName();
-
-	/**
-	 * Returns the concrete type of this object, must be one of the TYPE constants
-	 * defined in IDSConstants.
-	 * 
-	 * @return int value containing one of the TYPE constants defined in
-	 *         IDSConstants.
-	 * @see IDSConstants
-	 */
-	public abstract int getType();
-	
-	/**
-	 * Returns a boolean which represents if this object is capable of
-	 * containing children
-	 * 
-	 * @return true if this object can have children.
-	 */
-	public abstract boolean canBeParent();
-	
-	
-	/**
-	 * Returns all attributes` names of this element
-	 * 
-	 * @return an array of String containing all attributes` names
-	 */
-	public abstract String[] getAttributesNames();
-	
-	/**
-	 * Returns the XML Tag Name of this element
-	 * 
-	 * @return a String containing the XML Tag Name
-	 */
-	public abstract String getXMLTagName();
-	
-	
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperties.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperties.java
deleted file mode 100644
index b288ea7..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperties.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-
-
-/**
- * Represents a set of properties from a bundle entry
- * 
- * @since 3.4
- * @see IDSObject
- */
-public interface IDSProperties extends IDSObject {
-
-	/**
-	 * Sets the entry path relative to the root of the bundle
-	 * 
-	 * @param entry
-	 *            New entry path
-	 */
-	public void setEntry(String entry);
-
-	/**
-	 * Returns the value of the entry path
-	 * 
-	 * @return String value of the entry path
-	 */
-	public String getEntry();
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperty.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperty.java
deleted file mode 100644
index 95adeeb..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProperty.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * Represents a single property file
- * 
- * @since 3.4
- * @see IDSObject
- */
-public interface IDSProperty extends IDSObject {
-
-	
-	/**
-	 * Returns the name of the property
-	 * 
-	 * @return String containing the attribute name
-	 */
-	public String getPropertyName();
-
-	/**
-	 * Sets the name of the property
-	 * 
-	 * @param name
-	 *            New name
-	 */
-	public void setPropertyName(String name);
-
-	/**
-	 * Returns the value of the property
-	 * 
-	 * @return String containing the value of the property.
-	 */
-	public String getPropertyValue();
-
-	/**
-	 * Sets the value of the property.
-	 * 
-	 * @param value
-	 *            New value
-	 */
-	public void setPropertyValue(String value);
-
-	/**
-	 * Sets the type of the property.
-	 * 
-	 * The type defines how to interpret the value. The type must be one of the
-	 * following Java types: String (default), Long, Double, Float, Integer,
-	 * Byte, Character, Boolean, Short.
-	 * 
-	 * @param type
-	 *            New type
-	 */
-	public void setPropertyType(String type);
-
-	/**
-	 * Returns the type of the property.
-	 * 
-	 * @return String representing one of the following Java types: String
-	 *         (default), Long, Double, Float, Integer, Byte, Character,
-	 *         Boolean, Short.
-	 */
-	
-	public String getPropertyType();
-
-	/**
-	 * Sets the attribute body.
-	 * 
-	 * If the value attribute is not specified, the body of the property element
-	 * must contain one or more values.
-	 * 
-	 * The value of the property is then an array of the specified type. Except
-	 * for String objects, the result will be translated to an array of
-	 * primitive types. For example, if the type attribute specifies Integer,
-	 * then the resulting array must be int[].
-	 * 
-	 * For example, a component that needs an array of hosts can use the
-	 * following property definition:
-	 * <code> <property name="hosts"> www.acme.com
-	 * backup.acme.com </property> <\code>
-	 * 
-	 * @param body
-	 *            New body
-	 */
-	public void setPropertyElemBody(String body);
-
-
-	/**
-	 * Return all elements in body attribute
-	 * 
-	 * @return String containing the text of all elements in body attribute
-	 */
-	public String getPropertyElemBody();
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProvide.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProvide.java
deleted file mode 100644
index b08904e..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSProvide.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * Represents the provide element that define the service interfaces.
- * 
- * @since 3.4
- * @see IDSService
- * @see IDSObject
- */
-public interface IDSProvide extends IDSObject {
-
-	/**
-	 * Sets the name of the interface that this service is registered under.
-	 * This name must be the fully qualified name of a Java class.
-	 * 
-	 * @param interfaceName
-	 *            new fully qualified name of a Java class.
-	 */
-	public void setInterface(String interfaceName);
-
-	/**
-	 * Returns the name of the interface that this service is registered under.
-	 * 
-	 * @return String containing a fully qualified name of a Java class.
-	 */
-	public String getInterface();
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSReference.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSReference.java
deleted file mode 100644
index c94a1ee..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSReference.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * Represents a dependency that a component has on a set of target services.
- * 
- * A component configuration is not satisfied, unless all its references are
- * satisfied. A reference specifies target services by specifying their
- * interface and an optional target filter.
- * 
- * @since 3.4
- * @see IDSComponent
- * @see IDSObject
- */
-public interface IDSReference extends IDSObject {
-
-	/**
-	 * Sets the name of the reference.
-	 * 
-	 * This name is local to the component and can be used to locate a bound
-	 * service of this reference with one of the locateService methods of
-	 * ComponentContext.
-	 * 
-	 * @param name
-	 *            new name of the reference
-	 */
-	public void setReferenceName(String name);
-
-	/**
-	 * Returns the name of the reference.
-	 * 
-	 * @return String containing the name of the reference
-	 */
-	public String getReferenceName();
-
-	/**
-	 * Sets the fully qualified name of the class that is used by the component
-	 * to access the service.
-	 * 
-	 * The service provided to the component must be type compatible with this
-	 * class. That is, the component must be able to cast the service object to
-	 * this class. A service must be registered under this name to be considered
-	 * for the set of target services.
-	 * 
-	 * @param interfaceName
-	 *            new fully qualified name of the class used to access the
-	 *            service
-	 */
-	public void setReferenceInterface(String interfaceName);
-
-	/**
-	 * Returns the fully qualified name of the class that is used by the
-	 * component to access the service.
-	 * 
-	 * @return String containing the fully qualified name of the class used to
-	 *         access the service
-	 */
-	public String getReferenceInterface();
-
-	/**
-	 * Sets if the reference is optional and if the component implementation
-	 * support a single bound service or multiple bound services.
-	 * 
-	 * The cardinality for a reference can be specified as one of four choices:
-	 * 0..1 (optional and unary), 1..1 (mandatory and unary - default), 0..n
-	 * (optional and multiple), 1..n (mandatory and multiple).
-	 * 
-	 * @param cardinality
-	 *            new cardinality value
-	 */
-	public void setReferenceCardinality(String cardinality);
-
-	/**
-	 * Returns if the reference is optional and if the component implementation
-	 * support a single bound service or multiple bound services.
-	 * 
-	 * @return String containing one of four choices: 0..1 (optional and unary),
-	 *         1..1 (mandatory and unary - default), 0..n (optional and
-	 *         multiple), 1..n (mandatory and multiple).
-	 */
-	public String getReferenceCardinality();
-
-	/**
-	 * Sets the assumption of the component about dynamicity.
-	 * 
-	 * The policy for a reference can be specified as one of two choices: The
-	 * static policy is the most simple policy and is the default one. A
-	 * component instance never sees any of the dynamics. The dynamic policy is
-	 * the second option and is slightly more complex since the component
-	 * implementation must properly handle changes in the set of bound services.
-	 * 
-	 * @param policy
-	 *            new value of the policy (static or dynamic)
-	 * 
-	 */
-	public void setReferencePolicy(String policy);
-
-	/**
-	 * Return the policy of the component
-	 * 
-	 * @return String containing the policy value
-	 */
-	public String getReferencePolicy();
-
-	/**
-	 * Sets the optional OSGi Framework filter expression that further
-	 * constrains the set of target services.
-	 * 
-	 * The default is no filter, limiting the set of matched services to all
-	 * service registered under the given reference interface. The value of this
-	 * attribute is used to set a target property.
-	 * 
-	 * @param target
-	 *            the new value of attribute target
-	 */
-	public void setReferenceTarget(String target);
-
-	/**
-	 * Returns the target filter expression that further constrains the set of target
-	 * services.
-	 * 
-	 * @return String containing the attribute target value
-	 */
-	public String getReferenceTarget();
-
-	/**
-	 * Sets the name of a method in the component implementation class that is
-	 * used to notify that a service is bound to the component configuration.
-	 * 
-	 * For static references, this method is only called before the activate
-	 * method. For dynamic references, this method can also be called while the
-	 * component configuration is active.
-	 * 
-	 * @param bind
-	 *            new method's name to notify that a service is bound
-	 */
-	public void setReferenceBind(String bind);
-
-	/**
-	 * Returns the name of a method in the component implementation class that
-	 * is used to notify that a service is bound to the component configuration.
-	 * 
-	 * @return String containing the name of the method
-	 */
-	public String getReferenceBind();
-
-
-	/**
-	 * Sets the name of a method in the component implementation class that is
-	 * used to notify the component configuration that the service is unbound.
-	 * 
-	 * For static references, the method is only called after the deactivate
-	 * method. For dynamic references, this method can also be called while the
-	 * component configuration is active.
-	 * 
-	 * @param unbind
-	 *            new method's name to notify that a service is unbound
-	 */
-	public void setReferenceUnbind(String unbind);
-
-	/**
-	 * Returns the name of a method in the component implementation class that
-	 * is used to notify the component configuration that the service is
-	 * unbound.
-	 * 
-	 * @return String containing the name of the method
-	 */
-	public String getReferenceUnbind();
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSService.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSService.java
deleted file mode 100644
index 4ddeef4..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/IDSService.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core;
-
-/**
- * Represents the service information to be used when a component configuration
- * is to be registered as a service.
- * 
- * @since 3.4
- * @see IDSComponent
- * @see IDSObject
- */
-public interface IDSService extends IDSObject {
-
-	/**
-	 * Sets the attribute servicefactory
-	 * 
-	 * This attribute controls whether the service uses the ServiceFactory
-	 * concept of the OSGi Framework.
-	 * 
-	 * The default value is false.
-	 * 
-	 * If servicefactory is set to true, a different component configuration is
-	 * created, activated and its component instance returned as the service
-	 * object for each distinct bundle that requests the service.Each of these
-	 * component configurations has the same component properties.Otherwise, the
-	 * same component instance from the single component configuration is
-	 * returned as the service object for all bundles that request the service.
-	 * 
-	 * The servicefactory attribute must not be true if the component is a
-	 * factory component or an immediate component. This is because SCR is not
-	 * free to create component configurations as necessary to support
-	 * servicefactory. A component description is ill-formed if it specifies
-	 * that the component is a factory component or an immediate component and
-	 * servicefactory is set to true.
-	 * 
-	 * @param bool
-	 *            new boolean value of attribute servicefactory
-	 */
-	public void setServiceFactory(boolean bool);
-
-	/**
-	 * Returns the value of attribute servicefactory
-	 * 
-	 * @return boolean containing the value of attribute servicefactory
-	 */
-	public boolean getServiceFactory();
-
-	/**
-	 * Return all Service's interfaces
-	 * 
-	 * @return IDSProvide's array containing all provide elements
-	 */
-	public IDSProvide[] getProvidedServices();
-
-	/**
-	 * Adds a provide element with information about a service`s interface
-	 * 
-	 * @param provide IDSProvide object
-	 */
-	public void addProvidedService(IDSProvide provide);
-	
-	/**
-	 * Removes a provide element
-	 * 
-	 * @param provide IDSProvide object
-	 */
-	public void removeProvidedService(IDSProvide provide);
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Messages.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Messages.java
deleted file mode 100644
index 0d1e011..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/Messages.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 230232
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ds.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ds.core.messages"; //$NON-NLS-1$
-
-	public static String DSErrorReporter_cannotFindJavaType;
-	public static String DSErrorReporter_requiredElement;
-	public static String DSErrorReporter_requiredAttribute;
-	public static String DSErrorReporter_attrValue;
-	public static String DSErrorReporter_emptyAttrValue;
-	public static String DSErrorReporter_duplicateReferenceName;
-	public static String DSErrorReporter_requiredDefaultConstructor;
-	public static String DSErrorReporter_invalidTarget;
-	public static String DSErrorReporter_unimplementedProvidedInterface;
-	public static String DSErrorReporter_singleAndMultipleAttrValue;
-	public static String DSErrorReporter_emptyPropertyValue;
-	public static String DSErrorReporter_invalidImmediateValue;
-	public static String DSErrorReporter_invalidConfigurationPolicyValue;
-	public static String DSErrorReporter_invalidImmediateValueFactory;
-	public static String DSErrorReporter_duplicatedInterface;
-	public static String DSErrorReporter_cannotFindProperties;
-	public static String DSErrorReporter_invalidCardinalityValue;
-	public static String DSErrorReporter_invalidPolicyValue;
-	public static String DSErrorReporter_propertyTypeCastException;
-	public static String DSErrorReporter_illegalServiceFactory;
-	public static String DSErrorReporter_illegalServiceFactory_Immediate;
-	public static String DSErrorReporter_illegalEmptyService;
-	
-	public static String DSBuilder_verifying;
-	public static String DSBuilder_updating;
-
-	
-
-	
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java
deleted file mode 100644
index 1ba38ef..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSBuilder.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 230232
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.builders;
-
-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.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.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ds.core.Activator;
-import org.eclipse.pde.internal.ds.core.Messages;
-
-public class DSBuilder extends IncrementalProjectBuilder {
-
-	private static String PDE_NATURE = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-	private static IProject[] EMPTY_LIST = new IProject[0];
-
-	class ResourceVisitor implements IResourceVisitor {
-		private IProgressMonitor monitor;
-
-		public ResourceVisitor(IProgressMonitor monitor) {
-			this.monitor = monitor;
-		}
-		
-		public boolean visit(IResource resource) {
-			if (resource instanceof IProject) {
-				// TODO only check PDE projects...
-				IProject project = (IProject) resource;
-				try {
-					return (project.hasNature(PDE_NATURE));
-				} catch (CoreException e) {
-					// TODO log exception
-					return false;
-				}
-			}
-			if (resource instanceof IFile) {
-				// see if this is it
-				IFile candidate = (IFile) resource;
-				if (isDSFile(candidate)) {
-					checkFile(candidate, monitor);
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	class DeltaVisitor implements IResourceDeltaVisitor {
-		private IProgressMonitor monitor;
-	
-		public DeltaVisitor(IProgressMonitor monitor) {
-			this.monitor = monitor;
-		}
-	
-		public boolean visit(IResourceDelta delta) {
-			IResource resource = delta.getResource();
-	
-			if (resource instanceof IProject) {
-				// TODO only check PDE projects...
-				IProject project = (IProject) resource;
-				try {
-					return (project.hasNature(PDE_NATURE));
-				} catch (CoreException e) {
-					// TODO log exception
-					return false;
-				}
-			}
-			if (resource instanceof IFile) {
-				// see if this is it
-				IFile candidate = (IFile) resource;
-				if (isDSFile(candidate)) {
-					// That's it, but only check it if it has been added or changed
-					if (delta.getKind() != IResourceDelta.REMOVED) {
-						checkFile(candidate, monitor);
-						return true;
-					}
-				}
-			}
-			return true;
-		}
-	
-	}
-
-	protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
-			throws CoreException {
-		IResourceDelta delta = null;
-		if (kind != FULL_BUILD)
-			delta = getDelta(getProject());
-
-		if (delta == null || kind == FULL_BUILD) {
-			// Full build
-			IProject project = getProject();
-			project.accept(new ResourceVisitor(monitor));
-		} else {
-			delta.accept(new DeltaVisitor(monitor));
-		}
-		return EMPTY_LIST;
-	}
-
-	private boolean isDSFile(IFile candidate) {
-		try {
-			IContentDescription description = candidate.getContentDescription();
-			if (description == null)
-				return false;
-			IContentType type = description.getContentType();
-			return Activator.CONTENT_TYPE_ID.equals(type.getId());
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	private void checkFile(IFile file, IProgressMonitor monitor) {
-		if (monitor.isCanceled())
-			return;
-		String message = NLS.bind(Messages.DSBuilder_verifying, file
-				.getFullPath().toString());
-		monitor.subTask(message);
-		
-		DSErrorReporter reporter = new DSErrorReporter(file);
-		DefaultSAXParser.parse(file, reporter);
-		reporter.validateContent(monitor);
-		monitor.subTask(Messages.DSBuilder_updating);
-		monitor.done();
-	}
-	
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java
deleted file mode 100644
index b47ad7d..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java
+++ /dev/null

@@ -1,743 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 230232, 249254
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.builders;
-
-import java.lang.reflect.Constructor;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.text.Document;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ds.core.Activator;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.core.IDSService;
-import org.eclipse.pde.internal.ds.core.Messages;
-import org.eclipse.pde.internal.ds.core.text.DSModel;
-import org.osgi.framework.InvalidSyntaxException;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class DSErrorReporter extends XMLErrorReporter {
-	public static final int ERROR = 0;
-	public static final int WARNING = 1;
-	public static final int IGNORE = 2;
-
-	public DSErrorReporter(IFile file) {
-		super(file);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.builders.XMLErrorReporter#validateContent(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void validateContent(IProgressMonitor monitor) {
-
-		try {
-			Document textDocument = CoreUtility.getTextDocument(fFile
-					.getContents());
-			IDSModel model = new DSModel(textDocument, false);
-
-			model.load();
-
-			IDSComponent component = model.getDSComponent();
-
-			validateComponentElement(component);
-			validateImplementationElement(component.getImplementation());
-			validateServiceElement(component.getService());
-			validatePropertyElements(component.getPropertyElements());
-			validatePropertiesElements(component.getPropertiesElements());
-			validateReferenceElements(component.getReferences());
-
-		} catch (CoreException e) {
-			Activator.log(e);
-		}
-	}
-
-	private void validateBoolean(Element element, Attr attr) {
-		if (attr != null) {
-			String value = attr.getValue();
-			if (!value.equalsIgnoreCase("true") && !value.equalsIgnoreCase("false")) //$NON-NLS-1$ //$NON-NLS-2$
-				reportIllegalAttributeValue(element, attr);
-		}
-	}
-
-	private void reportIllegalAttributeValue(Element element, Attr attr) {
-		if (attr == null || attr.getValue() == null || attr.getName() == null)
-			return;
-		String message = NLS.bind(Messages.DSErrorReporter_attrValue, attr
-				.getValue(), attr.getName());
-		report(message, getLine(element, attr.getName()), ERROR,
-				DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateReferenceElements(IDSReference[] references) {
-		Hashtable referencedNames = new Hashtable();
-		for (int i = 0; i < references.length; i++) {
-			IDSReference reference = references[i];
-			Element element = (Element) getElements(reference).item(i);
-
-			// Validate Required Attributes
-			if (reference.getReferenceInterface() == null) {
-				reportMissingRequiredAttribute(element,
-						IDSConstants.ATTRIBUTE_REFERENCE_INTERFACE, ERROR);
-			} else {
-				// Validate Resource Existence
-				validateJavaElement(reference.getReferenceInterface(),
-						IDSConstants.ELEMENT_REFERENCE,
-						IDSConstants.ATTRIBUTE_REFERENCE_INTERFACE, i);
-			}
-
-			// Validate Allowed Values
-			validateReferenceCardinality(element);
-			// Validate Allowed Values
-			validateReferencePolicy(element);
-
-			// Validate duplicated names
-			validateReferenceElementNames(referencedNames, element);
-
-			// Validate target
-			validateTargetAttribute(element);
-
-		}
-
-	}
-
-	private void validateTargetAttribute(Element element) {
-		Attr attr = element
-				.getAttributeNode(IDSConstants.ATTRIBUTE_REFERENCE_TARGET);
-		if (attr != null) {
-			String value = attr.getValue();
-			try {
-				Activator.getDefault().getBundle().getBundleContext()
-						.createFilter(value);
-			} catch (InvalidSyntaxException ise) {
-				reportInvalidTarget(element, value);
-			}
-		}
-	}
-
-	private void reportInvalidTarget(Element element, String target) {
-		String name = element
-				.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_NAME);
-		String message = NLS.bind(Messages.DSErrorReporter_invalidTarget, name,
-				target);
-		report(message, getLine(element), ERROR, DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateReferenceElementNames(Hashtable referencedNames,
-			Element element) {
-		String name = element
-				.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_NAME);
-		if (name != null && referencedNames.containsKey(name)) {
-			reportDuplicateReferenceElementName(element, name);
-		} else {
-			referencedNames.put(name, name);
-		}
-	}
-
-	private void reportDuplicateReferenceElementName(Element element,
-			String name) {
-		Attr attr = element
-				.getAttributeNode(IDSConstants.ATTRIBUTE_REFERENCE_NAME);
-		if (attr == null || attr.getValue() == null || attr.getName() == null)
-			return;
-		String message = NLS.bind(
-				Messages.DSErrorReporter_duplicateReferenceName, name);
-		report(message,
-				getLine(element, IDSConstants.ATTRIBUTE_REFERENCE_NAME), ERROR,
-				DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateReferencePolicy(Element element) {
-		String attribute = element
-				.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_POLICY);
-		String allowedValues[] = new String[] {
-				IDSConstants.VALUE_REFERENCE_POLICY_DYNAMIC,
-				IDSConstants.VALUE_REFERENCE_POLICY_STATIC };
-
-		if (attribute != null && attribute.length() > 0) {
-			for (int i = 0; i < allowedValues.length; i++) {
-				if (allowedValues[i].equalsIgnoreCase(attribute)) {
-					return;
-				}
-			}
-			reportIllegalPolicy(element, attribute);
-		}
-
-	}
-
-	private void reportIllegalPolicy(Element element, String policy) {
-		String name = element
-				.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_NAME);
-		if (name == null)
-			name = element
-					.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_INTERFACE);
-		String message = NLS.bind(Messages.DSErrorReporter_invalidPolicyValue,
-				name, policy);
-		Attr attr = element
-				.getAttributeNode(IDSConstants.ATTRIBUTE_REFERENCE_POLICY);
-		report(message, getLine(element, attr.getName()), ERROR,
-				DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateReferenceCardinality(Element element) {
-		String cardinality = element
-				.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_CARDINALITY);
-		String allowedValues[] = new String[] {
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_N,
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_ONE,
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_N,
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_ONE };
-
-		if (cardinality != null) {
-			for (int i = 0; i < allowedValues.length; i++) {
-				if (allowedValues[i].equalsIgnoreCase(cardinality)) {
-					return;
-				}
-			}
-			reportIllegalCardinality(element, cardinality);
-		}
-
-	}
-
-	private void reportIllegalCardinality(Element element, String cardinality) {
-		String name = element
-				.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_NAME);
-		// if we don't have a name, use the interface
-		if (name == null) {
-			name = element
-					.getAttribute(IDSConstants.ATTRIBUTE_REFERENCE_INTERFACE);
-		}
-		String message = NLS.bind(
-				Messages.DSErrorReporter_invalidCardinalityValue, name,
-				cardinality);
-		Attr attr = element
-				.getAttributeNode(IDSConstants.ATTRIBUTE_REFERENCE_CARDINALITY);
-		if (attr == null || attr.getValue() == null || attr.getName() == null)
-			return;
-		report(message, getLine(element, attr.getName()), ERROR,
-				DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validatePropertiesElements(IDSProperties[] propertiesElements) {
-		for (int i = 0; i < propertiesElements.length; i++) {
-			IDSProperties properties = propertiesElements[i];
-			Element element = (Element) getElements(properties).item(i);
-
-			// Validate Required Attributes
-			if (properties.getEntry() == null
-					|| properties.getEntry().length() == 0) {
-				reportMissingRequiredAttribute(element,
-						IDSConstants.ATTRIBUTE_PROPERTIES_ENTRY, ERROR);
-			} else {
-				if (!fProject.exists(new Path((properties.getEntry())))) {
-					report(NLS
-.bind(
-							Messages.DSErrorReporter_cannotFindProperties,
-							properties.getEntry()), getLine(element), WARNING,
-							DSMarkerFactory.CAT_OTHER);
-				}
-			}
-
-		}
-
-	}
-
-	private void validatePropertyElements(IDSProperty[] propertyElements) {
-		for (int i = 0; i < propertyElements.length; i++) {
-			IDSProperty property = propertyElements[i];
-			Element element = (Element) getElements(property).item(i);
-
-			// Validate Required Attributes
-			String name = property.getName();
-			if (name == null || name.length() == 0) {
-				reportMissingRequiredAttribute(element,
-						IDSConstants.ATTRIBUTE_PROPERTY_NAME, ERROR);
-			}
-			// Validate Allowed Values
-			validatePropertyTypes(element);
-
-			// Validate Value Attribute and Body Values
-			validatePropertyAttrValueAndBody(element, property);
-
-			// Validate Type Specific Values
-			validatePropertyTypesValues(element, property);
-
-		}
-	}
-
-	private void validatePropertyTypesValues(Element element,
-			IDSProperty property) {
-		String type = property.getPropertyType();
-		String value = property.getPropertyValue();
-		String body = property.getPropertyElemBody();
-		if (value != null && value.length() > 0) {
-			validatePropertySpecificTypeValue(type, value, element);
-		} else {
-			if (body != null && body.length() > 0) {
-				validatePropertySpecificTypeBody(type, body, element);
-			}
-		}
-
-	}
-
-	private void validatePropertySpecificTypeBody(String type, String body,
-			Element element) {
-		StringTokenizer st = new StringTokenizer(body, "\n"); //$NON-NLS-1$
-		while (st.hasMoreTokens()) {
-			String token = st.nextToken();
-			token = token.trim();
-			if (token.length() > 0)
-				validatePropertySpecificTypeValue(type, token, element);
-		}
-	}
-
-	private void validatePropertySpecificTypeValue(String type, String value,
-			Element element) {
-
-		if (type == null) { // if null, we assume string
-			type = IDSConstants.VALUE_PROPERTY_TYPE_STRING;
-		}
-		// Validate Double, Long, Float, Integer, Byte, Short and
-		// String
-		if (!type.equals(IDSConstants.VALUE_PROPERTY_TYPE_CHAR)
-				&& !type.equals(IDSConstants.VALUE_PROPERTY_TYPE_BOOLEAN)) {
-			try {
-				Class forName = Class.forName("java.lang." + type); //$NON-NLS-1$
-				Constructor[] constructors = forName.getConstructors();
-				for (int i = 0; i < constructors.length; i++) {
-					Constructor constructor = constructors[i];
-					Class[] parameterTypes = constructor.getParameterTypes();
-					if (parameterTypes.length == 1) {
-						if (parameterTypes[0].equals(Class
-								.forName("java.lang.String"))) { //$NON-NLS-1$
-							constructor.newInstance(new Object[] { value });
-
-						}
-					}
-
-				}
-
-			} catch (Exception e) {
-				reportPropertyTypeCastException(element, value, type);
-			}
-		} else {
-			// Validate Booleans
-			if (type.equals(IDSConstants.VALUE_PROPERTY_TYPE_BOOLEAN)) {
-				if (!value.equals(IDSConstants.VALUE_FALSE)
-						&& !value.equals(IDSConstants.VALUE_TRUE)) {
-					reportPropertyTypeCastException(element, value, type);
-				}
-			} else {
-				// Validate Chars
-				if (type.equals(IDSConstants.VALUE_PROPERTY_TYPE_CHAR)) {
-					if (value.length() > 1) {
-						reportPropertyTypeCastException(element, value, type);
-					}
-				}
-			}
-		}
-	}
-
-	private void reportPropertyTypeCastException(Element element, String value,
-			String type) {
-		String message = NLS.bind(
-				Messages.DSErrorReporter_propertyTypeCastException,
-				new String[] { value, type });
-		report(message, getLine(element), WARNING, DSMarkerFactory.CAT_OTHER);
-	}
-
-	/**
-	 * Validates if a property elements defines a single value and multiple
-	 * values at the same time.
-	 * 
-	 * @param element
-	 * @param property
-	 */
-	private void validatePropertyAttrValueAndBody(Element element,
-			IDSProperty property) {
-		if (property.getPropertyValue() != null) {
-			if (property.getPropertyElemBody() != null
-					&& !property.getPropertyElemBody().equals("")) { //$NON-NLS-1$
-				String propertyName = property.getPropertyName();
-				reportSingleAndMultiplePropertyValues(element, propertyName,
-						property.getPropertyValue());
-			}
-			String propertyType = property.getPropertyType();
-			if (propertyType == null
-					|| propertyType
-							.equals(IDSConstants.VALUE_PROPERTY_TYPE_STRING))
-				return; // It's OK for a property of type "String" to have a
-			// value of "".
-			if (property.getPropertyValue().equals("")) { //$NON-NLS-1$
-				String propertyName = property.getPropertyName();
-				reportEmptyPropertyValue(element, propertyName);
-			}
-		} else {
-			if (property.getPropertyElemBody() == null
-					|| property.getPropertyElemBody().equals("")) { //$NON-NLS-1$
-				String propertyName = property.getPropertyName();
-				reportEmptyPropertyValue(element, propertyName);
-			}
-		}
-	}
-
-	private void reportEmptyPropertyValue(Element element, String propertyName) {
-		String message = NLS.bind(Messages.DSErrorReporter_emptyPropertyValue,
-				propertyName);
-		report(message, getLine(element), WARNING, DSMarkerFactory.CAT_OTHER);
-
-	}
-
-	private void reportSingleAndMultiplePropertyValues(Element element,
-			String propertyName, String value) {
-		String message = NLS.bind(
-				Messages.DSErrorReporter_singleAndMultipleAttrValue,
-				propertyName, value);
-		report(message, getLine(element), WARNING, DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validatePropertyTypes(Element element) {
-		String attribute = element
-				.getAttribute(IDSConstants.ATTRIBUTE_PROPERTY_TYPE);
-		String allowedValues[] = new String[] {
-				IDSConstants.VALUE_PROPERTY_TYPE_BOOLEAN,
-				IDSConstants.VALUE_PROPERTY_TYPE_BYTE,
-				IDSConstants.VALUE_PROPERTY_TYPE_CHAR,
-				IDSConstants.VALUE_PROPERTY_TYPE_DOUBLE,
-				IDSConstants.VALUE_PROPERTY_TYPE_FLOAT,
-				IDSConstants.VALUE_PROPERTY_TYPE_INTEGER,
-				IDSConstants.VALUE_PROPERTY_TYPE_LONG,
-				IDSConstants.VALUE_PROPERTY_TYPE_SHORT,
-				IDSConstants.VALUE_PROPERTY_TYPE_STRING };
-
-		if (attribute != null) {
-			for (int i = 0; i < allowedValues.length; i++) {
-				if (allowedValues[i].equalsIgnoreCase(attribute)) {
-					return;
-				}
-			}
-			reportIllegalAttributeValue(element, element
-					.getAttributeNode(IDSConstants.ATTRIBUTE_PROPERTY_TYPE));
-		}
-
-	}
-
-	private void validateImplementationElement(IDSImplementation implementation) {
-		if (implementation != null) {
-			String className = implementation.getClassName();
-			Element element = (Element) getElements(implementation).item(0);
-
-			if (className == null) {
-				// Validate Required Attributes
-				reportMissingRequiredAttribute(element,
-						IDSConstants.ATTRIBUTE_IMPLEMENTATION_CLASS, ERROR);
-			} else {
-				// validate Resource Existence
-				validateJavaElement(className,
-						IDSConstants.ELEMENT_IMPLEMENTATION,
-						IDSConstants.ATTRIBUTE_IMPLEMENTATION_CLASS, 0);
-
-				// validate Class Default Constructor
-				// validateClassDefaultConstructor(element, className);
-
-			}
-		}
-
-	}
-
-	// private void validateClassDefaultConstructor(Element element,
-	// String className) {
-	// try {
-	// Class.forName(className);
-	// } catch (ClassNotFoundException e) {
-	// reportDefaultConstructorNotDefined(element, className);
-	// }
-	// }
-	//
-	// private void reportDefaultConstructorNotDefined(Element element,
-	// String className) {
-	// String message = NLS.bind(
-	// Messages.DSErrorReporter_requiredDefaultConstructor,
-	// (new String[] { className }));
-	// report(message, getLine(element), WARNING, DSMarkerFactory.CAT_OTHER);
-	// }
-
-	private void validateJavaElement(String fullyQualifiedName,
-			String elementName, String attrName, int index) {
-		try {
-			if (fProject.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject jp = JavaCore.create(fProject);
-				if (!DSJavaHelper.isOnClasspath(fullyQualifiedName, (jp))) {
-					reportJavaTypeNotFound(elementName, attrName,
-							fullyQualifiedName, index);
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	private void reportMissingRequiredAttribute(Element element,
-			String attName, int severity) {
-		String message = NLS.bind(Messages.DSErrorReporter_requiredAttribute,
-				attName, element.getNodeName());
-		report(message, getLine(element), severity, DSMarkerFactory.CAT_OTHER);
-	}
-
-	/**
-	 * 
-	 * @param elementConstant
-	 *            element name
-	 * @param attributeConstant
-	 *            attribute name
-	 * @param resource
-	 *            resource qualified name
-	 * @param index
-	 *            used to select an element among many from the same type
-	 */
-	private void reportJavaTypeNotFound(String elementConstant,
-			String attributeConstant, String resource, int index) {
-		Element documentRoot = getDocumentRoot();
-		NodeList elementsByTagName = documentRoot
-				.getElementsByTagName(elementConstant);
-		Element element = (Element) elementsByTagName.item(index);
-		report(NLS.bind(Messages.DSErrorReporter_cannotFindJavaType, resource,
-				attributeConstant), getLine(element), WARNING,
-				DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateComponentElement(IDSComponent component) {
-		if (component != null) {
-			Element element = getDocumentRoot();
-			// Validate Required Children
-			if (component.getImplementation() == null) {
-				report(NLS.bind(Messages.DSErrorReporter_requiredElement,
-						IDSConstants.ELEMENT_IMPLEMENTATION),
-						getLine(getDocumentRoot()), ERROR,
-						DSMarkerFactory.CAT_OTHER);
-			}
-
-			// validate boolean values
-			validateBoolean(
-					element,
-					element
-							.getAttributeNode(IDSConstants.ATTRIBUTE_COMPONENT_IMMEDIATE));
-			validateBoolean(element, element
-					.getAttributeNode(IDSConstants.ATTRIBUTE_COMPONENT_ENABLED));
-
-			// validate non-empty values
-			validateEmpty(element, element
-					.getAttributeNode(IDSConstants.ATTRIBUTE_COMPONENT_FACTORY));
-
-			validateEmpty(element, element
-					.getAttributeNode(IDSConstants.ATTRIBUTE_COMPONENT_NAME));
-
-			// validate immediate values
-			validateImmediateAttribute(element, component);
-
-			validateConfigurationPolicyAttribute(element, component);
-
-		}
-	}
-
-	private void validateConfigurationPolicyAttribute(Element element,
-			IDSComponent component) {
-
-		String modified = component.getModifiedMethod();
-		String policy = component.getConfigurationPolicy();
-		if (policy != null && policy.length() > 0) {
-			if (policy
-					.equalsIgnoreCase(IDSConstants.VALUE_CONFIGURATION_POLICY_IGNORE)) {
-				if (modified != null && modified.length() > 0) {
-					report(
-							Messages.DSErrorReporter_invalidConfigurationPolicyValue,
-							getLine(element), WARNING,
-							DSMarkerFactory.CAT_OTHER);
-				}
-			}
-		}
-	}
-
-	private void validateImmediateAttribute(Element element,
-			IDSComponent component) {
-		boolean isService = false;
-		boolean isFactory = component.getFactory() != null;
-		boolean isImmediate = component.getImmediate();
-
-		if (component.getService() != null) {
-			IDSProvide[] providedServices = component.getService()
-					.getProvidedServices();
-			if (providedServices != null && providedServices.length > 0) {
-				isService = true;
-			}
-		}
-		if (!isService && !isFactory && !isImmediate
-				&& component
-						.getXMLAttributeValue(IDSConstants.ATTRIBUTE_COMPONENT_IMMEDIATE) != null) {
-			reportInvalidImmediate(element);
-		}
-
-		if (isFactory && isImmediate) {
-			reportInvalidImmediateFactory(element);
-		}
-
-	}
-
-	private void reportInvalidImmediateFactory(Element element) {
-		report(Messages.DSErrorReporter_invalidImmediateValueFactory,
-				getLine(element), WARNING, DSMarkerFactory.CAT_OTHER);
-
-	}
-
-	private void reportInvalidImmediate(Element element) {
-		report(Messages.DSErrorReporter_invalidImmediateValue,
-				getLine(element), WARNING, DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateEmpty(Element element, Attr attr) {
-		if (attr != null) {
-			String value = attr.getValue();
-			if (value.equalsIgnoreCase("")) //$NON-NLS-1$
-				reportIllegalEmptyAttributeValue(element, attr);
-		}
-	}
-
-	private void reportIllegalEmptyAttributeValue(Element element, Attr attr) {
-		if (attr == null || attr.getValue() == null || attr.getName() == null)
-			return;
-		String message = NLS.bind(Messages.DSErrorReporter_emptyAttrValue, attr
-				.getName());
-		report(message, getLine(element, attr.getName()), ERROR,
-				DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateServiceElement(IDSService service) {
-		if (service != null) {
-			Element element = (Element) getElements(service).item(0);
-
-			validateBoolean(element, element
-					.getAttributeNode(IDSConstants.ATTRIBUTE_SERVICE_FACTORY));
-
-			validateServiceFactory(element, service);
-
-			IDSProvide[] providedServices = service.getProvidedServices();
-			if (providedServices.length == 0) {
-				reportEmptyService(element);
-			} else {
-				validateProvideElement(providedServices);
-			}
-		}
-	}
-
-	private void reportEmptyService(Element element) {
-		report(Messages.DSErrorReporter_illegalEmptyService, getLine(element),
-				ERROR, DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateServiceFactory(Element element, IDSService service) {
-		IDSComponent component = service.getComponent();
-		boolean isFactory = component.getFactory() != null;
-		boolean isImmediate = component.getImmediate();
-
-		if (isFactory) {
-			if (service.getServiceFactory()) {
-				reportIllegalServiceFactory(element);
-			}
-		}
-
-		if (isImmediate) {
-			if (service.getServiceFactory()) {
-				reportIllegalServiceFactory_Immediate(element);
-			}
-		}
-	}
-
-	private void reportIllegalServiceFactory_Immediate(Element element) {
-		report(Messages.DSErrorReporter_illegalServiceFactory_Immediate,
-				getLine(element), ERROR, DSMarkerFactory.CAT_OTHER);
-
-
-	}
-
-	private void reportIllegalServiceFactory(Element element) {
-		report(Messages.DSErrorReporter_illegalServiceFactory,
-				getLine(element), ERROR, DSMarkerFactory.CAT_OTHER);
-	}
-
-	private void validateProvideElement(IDSProvide[] providedServices) {
-		Hashtable providedInterfaces = new Hashtable();
-
-		for (int i = 0; i < providedServices.length; i++) {
-			IDSProvide provide = providedServices[i];
-
-			Element element = (Element) getElements(provide).item(i);
-
-			// Validate Required Attributes
-			if (provide.getInterface() == null) {
-				reportMissingRequiredAttribute(element,
-						IDSConstants.ATTRIBUTE_PROVIDE_INTERFACE, ERROR);
-			} else {
-				validateJavaElement(provide.getInterface(),
-						IDSConstants.ELEMENT_PROVIDE,
-						IDSConstants.ATTRIBUTE_PROVIDE_INTERFACE, i);
-
-				// validate if implementation class implements services
-				// interfaces
-				// validateClassInstanceofProvidedInterface(element, provide);
-
-				// validate duplicate interfaces
-				validateDuplicateInterface(providedInterfaces, provide, element);
-			}
-		}
-	}
-
-	private void validateDuplicateInterface(Hashtable providedInterfaces,
-			IDSProvide provide, Element element) {
-		String interface1 = provide.getInterface();
-		if (providedInterfaces.get(interface1) != null) {
-			String message = NLS.bind(
-					Messages.DSErrorReporter_duplicatedInterface, interface1);
-			report(message, getLine(element), WARNING,
-					DSMarkerFactory.CAT_OTHER);
-		} else {
-			providedInterfaces.put(interface1, interface1);
-		}
-	}
-
-	// TODO this is a hack
-	private NodeList getElements(IDocumentElementNode node) {
-		String name = node.getXMLTagName();
-		String prefix = node.getNamespacePrefix();
-		if (prefix != null && prefix.length() > 0) {
-			name = prefix + ":" + name; //$NON-NLS-1$
-		}
-		return getDocumentRoot().getElementsByTagName(name);
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSJavaHelper.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSJavaHelper.java
deleted file mode 100644
index eac4d95..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSJavaHelper.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira N√≥brega <rafael.oliveira@gmail.com> - bug 230232
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.builders;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-
-
-
-public class DSJavaHelper {
-
-	public static boolean isOnClasspath(String fullyQualifiedName,
-			IJavaProject project) {
-		if (fullyQualifiedName.indexOf('$') != -1)
-			fullyQualifiedName = fullyQualifiedName.replace('$', '.');
-		try {
-			IType type = project.findType(fullyQualifiedName);
-			return type != null && type.exists();
-		} catch (JavaModelException e) {
-		}
-		return false;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSMarkerFactory.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSMarkerFactory.java
deleted file mode 100644
index 8d76f9c..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSMarkerFactory.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 230232
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.builders;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
-public class DSMarkerFactory {
-	
-	public static final String MARKER_ID = "org.eclipse.pde.ds.core.problem"; //$NON-NLS-1$
-	public static final int NO_RESOLUTION = -1;
-	
-	public static final String CAT_OTHER = ""; //$NON-NLS-1$
-
-	/**
-	 * @param file
-	 * @return
-	 * @throws CoreException
-	 */
-	public IMarker createMarker(IFile file) throws CoreException {
-		return createMarker(file, NO_RESOLUTION, ""); //$NON-NLS-1$
-	}
-
-	public IMarker createMarker(IFile file, int id, String category)
-			throws CoreException {
-		IMarker marker = file.createMarker(MARKER_ID);
-		marker.setAttribute("id", id); //$NON-NLS-1$
-		marker.setAttribute("categoryId", category); //$NON-NLS-1$
-		return marker;
-	}
-	
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DefaultSAXParser.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DefaultSAXParser.java
deleted file mode 100644
index 4cca1da..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DefaultSAXParser.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira N√≥brega <rafael.oliveira@gmail.com> - bug 230232
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ds.core.builders;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.internal.core.util.SAXParserWrapper;
-import org.xml.sax.SAXException;
-
-public class DefaultSAXParser {
-
-	public static void parse(IFile file, XMLErrorReporter reporter) {
-		InputStream stream = null;
-		SAXParserWrapper parser = null;
-		try {
-			parser = new SAXParserWrapper();
-			stream = new BufferedInputStream(file.getContents());
-			parser.parse(stream, reporter);
-		} catch (CoreException e) {
-		} catch (SAXException e) {
-		} catch (IOException e) {
-		} catch (ParserConfigurationException e) {
-		} finally {
-			try {
-				if (stream != null)
-					stream.close();
-			} catch (IOException e1) {
-			}
-		}
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/XMLErrorReporter.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/XMLErrorReporter.java
deleted file mode 100644
index 268fa3e..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/XMLErrorReporter.java
+++ /dev/null

@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.builders;
-
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Stack;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filebuffers.LocationKind;
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-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.pde.internal.core.builders.CompilerFlags;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class XMLErrorReporter extends DefaultHandler {
-
-	public static final char F_ATT_PREFIX = '@';
-	public static final char F_ATT_VALUE_PREFIX = '!';
-	public static final char F_CHILD_SEP = '>';
-
-	class ElementData {
-		int offset;
-		boolean fErrorNode;
-
-		public ElementData(int offset) {
-			this.offset = offset;
-		}
-	}
-
-	protected IFile fFile;
-	protected IProject fProject;
-	private int fErrorCount;
-	private DSMarkerFactory fMarkerFactory;
-	private org.w3c.dom.Document fXMLDocument;
-	private IDocument fTextDocument;
-	private Stack fElementStack;
-	private Element fRootElement;
-	private Locator fLocator;
-	private int fHighestOffset;
-	private HashMap fOffsetTable;
-	private FindReplaceDocumentAdapter fFindReplaceAdapter;
-
-	public XMLErrorReporter(IFile file) {
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			fFile = file;
-			fProject = file.getProject();
-			manager.connect(file.getFullPath(), LocationKind.NORMALIZE, null);
-			fTextDocument = manager.getTextFileBuffer(file.getFullPath(), LocationKind.NORMALIZE).getDocument();
-			manager.disconnect(file.getFullPath(), LocationKind.NORMALIZE, null);
-			fFindReplaceAdapter = new FindReplaceDocumentAdapter(fTextDocument);
-			fOffsetTable = new HashMap();
-			fElementStack = new Stack();
-			removeFileMarkers();
-		} catch (CoreException e) {
-			// TODO log message
-		}
-	}
-
-	public IFile getFile() {
-		return fFile;
-	}
-
-	private IMarker addMarker(String message, int lineNumber, int severity, int fixId, String category) {
-		try {
-			IMarker marker = getMarkerFactory().createMarker(fFile, fixId, category);
-			marker.setAttribute(IMarker.MESSAGE, message);
-			marker.setAttribute(IMarker.SEVERITY, severity);
-			if (lineNumber == -1)
-				lineNumber = 1;
-			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
-			if (severity == IMarker.SEVERITY_ERROR)
-				fErrorCount += 1;
-			return marker;
-		} catch (CoreException e) {
-			// TODO log something
-		}
-		return null;
-	}
-
-	private DSMarkerFactory getMarkerFactory() {
-		if (fMarkerFactory == null)
-			fMarkerFactory = new DSMarkerFactory();
-		return fMarkerFactory;
-	}
-
-	private void addMarker(SAXParseException e, int severity) {
-		addMarker(e.getMessage(), e.getLineNumber(), severity,
-				DSMarkerFactory.NO_RESOLUTION, DSMarkerFactory.CAT_OTHER);
-	}
-
-	public void error(SAXParseException exception) throws SAXException {
-		addMarker(exception, IMarker.SEVERITY_ERROR);
-		generateErrorElementHierarchy();
-	}
-
-	public void fatalError(SAXParseException exception) throws SAXException {
-		addMarker(exception, IMarker.SEVERITY_ERROR);
-		generateErrorElementHierarchy();
-	}
-
-	public int getErrorCount() {
-		return fErrorCount;
-	}
-
-	private void removeFileMarkers() {
-		try {
-			fFile.deleteMarkers(IMarker.PROBLEM, false, IResource.DEPTH_ZERO);
-			fFile.deleteMarkers(DSMarkerFactory.MARKER_ID, false, IResource.DEPTH_ZERO);
-		} catch (CoreException e) {
-			// TODO log exception
-		}
-	}
-
-
-	public IMarker report(String message, int line, int severity, int fixId, String category) {
-		if (severity == CompilerFlags.ERROR)
-			return addMarker(message, line, IMarker.SEVERITY_ERROR, fixId, category);
-		if (severity == CompilerFlags.WARNING)
-			return addMarker(message, line, IMarker.SEVERITY_WARNING, fixId, category);
-		return null;
-	}
-
-	public IMarker report(String message, int line, int severity, String category) {
-		return report(message, line, severity, DSMarkerFactory.NO_RESOLUTION,
-				category);
-	}
-
-	public void warning(SAXParseException exception) throws SAXException {
-		addMarker(exception, IMarker.SEVERITY_WARNING);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#startDocument()
-	 */
-	public void startDocument() throws SAXException {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		try {
-			// TODO we should be using a dom level 2 impl
-			fXMLDocument = factory.newDocumentBuilder().newDocument();
-		} catch (ParserConfigurationException e) {
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#endDocument()
-	 */
-	public void endDocument() throws SAXException {
-		fXMLDocument.appendChild(fRootElement);
-	}
-
-	/* (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 {
-		Element element = fXMLDocument.createElement(qName);
-		for (int i = 0; i < attributes.getLength(); i++) {
-			element.setAttribute(attributes.getQName(i), attributes.getValue(i));
-		}
-
-		if (fRootElement == null)
-			fRootElement = element;
-		else
-			((Element) fElementStack.peek()).appendChild(element);
-		fElementStack.push(element);
-		try {
-			if (fTextDocument != null)
-				fOffsetTable.put(element, new ElementData(getStartOffset(qName)));
-		} catch (BadLocationException e) {
-		}
-	}
-
-	/* (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 {
-		fElementStack.pop();
-	}
-
-	private void generateErrorElementHierarchy() {
-		while (!fElementStack.isEmpty()) {
-			ElementData data = (ElementData) fOffsetTable.get(fElementStack.pop());
-			if (data != null)
-				data.fErrorNode = true;
-		}
-	}
-
-	/* (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 = fXMLDocument.createTextNode(buff.toString());
-		if (fRootElement == null)
-			fXMLDocument.appendChild(text);
-		else
-			((Element) fElementStack.peek()).appendChild(text);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#setDocumentLocator(org.xml.sax.Locator)
-	 */
-	public void setDocumentLocator(Locator locator) {
-		fLocator = locator;
-	}
-
-	private int getStartOffset(String elementName) throws BadLocationException {
-		int line = fLocator.getLineNumber();
-		int col = fLocator.getColumnNumber();
-		if (col < 0)
-			col = fTextDocument.getLineLength(line);
-		String text = fTextDocument.get(fHighestOffset + 1, fTextDocument.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 getAttributeOffset(String name, String value, int offset) throws BadLocationException {
-		IRegion nameRegion = fFindReplaceAdapter.find(offset, name + "=\"" + getWritableString(value), true, false, false, false); //$NON-NLS-1$
-		if (nameRegion != null) {
-			return nameRegion.getOffset();
-		}
-		return -1;
-	}
-
-	private String getWritableString(String source) {
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < source.length(); i++) {
-			char c = source.charAt(i);
-			switch (c) {
-				case '&' :
-					buf.append("&amp;"); //$NON-NLS-1$
-					break;
-				case '<' :
-					buf.append("&lt;"); //$NON-NLS-1$
-					break;
-				case '>' :
-					buf.append("&gt;"); //$NON-NLS-1$
-					break;
-				case '\'' :
-					buf.append("&apos;"); //$NON-NLS-1$
-					break;
-				case '\"' :
-					buf.append("&quot;"); //$NON-NLS-1$
-					break;
-				default :
-					buf.append(c);
-					break;
-			}
-		}
-		return buf.toString();
-	}
-
-	protected String getTextContent(Element element) {
-		ElementData data = (ElementData) fOffsetTable.get(element);
-		try {
-			IRegion nameRegion = fFindReplaceAdapter.find(data.offset, "</" + element.getNodeName() + ">", true, true, false, false); //$NON-NLS-1$ //$NON-NLS-2$
-			int offset = data.offset + element.getNodeName().length() + 2;
-			if (nameRegion != null)
-				return fTextDocument.get(offset, nameRegion.getOffset() - offset).trim();
-		} catch (BadLocationException e) {
-		}
-		return null;
-	}
-
-	protected int getLine(Element element) {
-		ElementData data = (ElementData) fOffsetTable.get(element);
-		try {
-			return (data == null) ? 1 : fTextDocument.getLineOfOffset(data.offset) + 1;
-		} catch (Exception e) {
-			return 1;
-		}
-	}
-
-	protected int getLine(Element element, String attName) {
-		ElementData data = (ElementData) fOffsetTable.get(element);
-		try {
-			int offset = getAttributeOffset(attName, element.getAttribute(attName), data.offset);
-			if (offset != -1)
-				return fTextDocument.getLineOfOffset(offset) + 1;
-		} catch (BadLocationException e) {
-		}
-		return getLine(element);
-	}
-
-	public void validateContent(IProgressMonitor monitor) {
-
-	}
-
-	public Element getDocumentRoot() {
-		if (fRootElement != null)
-			fRootElement.normalize();
-		return fRootElement;
-	}
-
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-		int x = fTextDocument.get().indexOf("!DOCTYPE"); //$NON-NLS-1$
-		if (x > 0) {
-			// do something?
-		}
-		// Prevent the resolution of external entities in order to
-		// prevent the parser from accessing the Internet
-		// This will prevent huge workbench performance degradations and hangs
-		return new InputSource(new StringReader("")); //$NON-NLS-1$
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/messages.properties b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/messages.properties
deleted file mode 100644
index b00613d..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/messages.properties
+++ /dev/null

@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-DSErrorReporter_cannotFindJavaType = The Java type ''{0}'' in the attribute ''{1}'' cannot be found.
-DSErrorReporter_requiredElement = The element ''{0}'' must be defined.
-DSErrorReporter_requiredAttribute = An element of type ''{1}'' must define a ''{0}'' attribute value.
-DSErrorReporter_attrValue = The value ''{0}'' for the attribute ''{1}'' is illegal.
-DSErrorReporter_emptyAttrValue = The attribute ''{0}'' cannot be empty.
-DSErrorReporter_duplicateReferenceName = The referenced service name ''{0}'' is not unique to the component.
-DSErrorReporter_requiredDefaultConstructor = The class ''{0}'' must have a default constructor.
-DSErrorReporter_invalidTarget = The referenced service ''{0}'' has a target of ''{1}'' that is not a well-formed LDAP filter.
-DSErrorReporter_unimplementedProvidedInterface = The provided service ''{1}'' is not a supertype of the component implementation class ''{0}''.
-DSErrorReporter_singleAndMultipleAttrValue = The property ''{0}'' cannot define both the single value ''{1}'' and an array of values.
-DSErrorReporter_emptyPropertyValue = The property ''{0}'' must contain one or more values. 
-DSErrorReporter_invalidImmediateValue = The component must be immediate when it does not provide any services and is not a factory component.
-DSErrorReporter_invalidImmediateValueFactory = A factory component cannot be immediate.
-DSErrorReporter_duplicatedInterface = The service ''{0}'' is already provided.
-DSErrorReporter_cannotFindProperties = The properties file ''{0}'' cannot be found.
-DSErrorReporter_invalidCardinalityValue = The referenced service ''{0}'' has a cardinality of ''{1}'' that is illegal.
-DSErrorReporter_invalidPolicyValue = The referenced service ''{0}'' has a policy of ''{1}'' that is illegal.
-DSErrorReporter_propertyTypeCastException = The value ''{0}'' is not a valid ''{1}'' type
-DSErrorReporter_illegalServiceFactory = A factory component cannot be a service factory.
-DSErrorReporter_illegalServiceFactory_Immediate = An immediate component cannot be a service factory.
-DSErrorReporter_illegalEmptyService = The 'service' element must contain at least one 'provide' element.
-DSErrorReporter_invalidConfigurationPolicyValue = The modified method will not be called since the configuration policy is set to ignore.
-
-DSBuilder_updating = Updating ...
-DSBuilder_verifying = Verifying {0} ...
\ No newline at end of file

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSComponent.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSComponent.java
deleted file mode 100644
index 2a4c636..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSComponent.java
+++ /dev/null

@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 223738
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-import java.util.ArrayList;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-
-/**
- * Represents the root "component" entry in a DS xml file. There may be only one
- * root node in the file and all other nodes must be inside the root. The
- * structure of component XML grammar is:
- * 
- * <component> ::= <implementation> <properties> * <service> ? <reference> *
- * 
- * @since 3.4
- * @see DSObject
- * @see DSModel
- * @see DSDocumentFactory
- */
-public class DSComponent extends DSObject implements IDSComponent {
-
-	private static final long serialVersionUID = 1L;
-
-	public DSComponent(DSModel model) {
-		super(model, ELEMENT_COMPONENT);
-		setAttributeName(IDSConstants.ELEMENT_COMPONENT);
-		setNamespace(IDSConstants.NAMESPACE); // hard code namespace to be 1.1
-		setNamespacePrefix("scr"); //$NON-NLS-1$
-		setInTheModel(true);
-	}
-
-	public boolean isRoot() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_COMPONENT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getName()
-	 */
-	public String getName() {
-		return this.getAttributeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-	public boolean canAddChild(int objectType) {
-		return objectType == TYPE_IMPLEMENTATION
-				|| objectType == TYPE_PROPERTIES || objectType == TYPE_PROPERTY
-				|| objectType == TYPE_SERVICE || objectType == TYPE_REFERENCE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#setAttributeName(java.lang.String)
-	 */
-	public void setAttributeName(String name) {
-		setXMLAttribute(ATTRIBUTE_COMPONENT_NAME, name);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#getAttributeName()
-	 */
-	public String getAttributeName() {
-		return getXMLAttributeValue(ATTRIBUTE_COMPONENT_NAME);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean bool) {
-		setBooleanAttributeValue(ATTRIBUTE_COMPONENT_ENABLED, bool);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#getEnabled()
-	 */
-	public boolean getEnabled() {
-		return getBooleanAttributeValue(ATTRIBUTE_COMPONENT_ENABLED, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#setFactory(java.lang.String)
-	 */
-	public void setFactory(String factory) {
-		setXMLAttribute(ATTRIBUTE_COMPONENT_FACTORY, factory);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#getFactory()
-	 */
-	public String getFactory() {
-		return getXMLAttributeValue(ATTRIBUTE_COMPONENT_FACTORY);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#setImmediate(boolean)
-	 */
-	public void setImmediate(boolean bool) {
-		setBooleanAttributeValue(ATTRIBUTE_COMPONENT_IMMEDIATE, bool);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#getImmediate()
-	 */
-	public boolean getImmediate() {
-		return getBooleanAttributeValue(ATTRIBUTE_COMPONENT_IMMEDIATE, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#getImplemention()
-	 */
-	public IDSImplementation getImplementation() {
-		ArrayList childNodesList = getChildNodesList(IDSImplementation.class,
-				true);
-		if (childNodesList.size() == 0) {
-			return null;
-		}
-		return (IDSImplementation) childNodesList.get(0);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#getPropertiesElements()
-	 */
-	public IDSProperties[] getPropertiesElements() {
-		ArrayList childNodesList = getChildNodesList(IDSProperties.class, true);
-		IDSProperties[] array = new IDSProperties[childNodesList.size()];
-		for (int i = 0; i < childNodesList.size(); i++) {
-			array[i] = (IDSProperties) childNodesList.get(i);
-		}
-		return array;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#getPropertyElements()
-	 */
-	public IDSProperty[] getPropertyElements() {
-		ArrayList childNodesList = getChildNodesList(IDSProperty.class, true);
-		IDSProperty[] array = new IDSProperty[childNodesList.size()];
-		for (int i = 0; i < childNodesList.size(); i++) {
-			array[i] = (IDSProperty) childNodesList.get(i);
-		}
-		return array;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#getReferences()
-	 */
-	public IDSReference[] getReferences() {
-		ArrayList childNodesList = getChildNodesList(IDSReference.class, true);
-		IDSReference[] array = new IDSReference[childNodesList.size()];
-		for (int i = 0; i < childNodesList.size(); i++) {
-			array[i] = (IDSReference) childNodesList.get(i);
-		}
-		return array;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#getService()
-	 */
-	public IDSService getService() {
-		ArrayList childNodesList = getChildNodesList(IDSService.class, true);
-		if (childNodesList.size() == 0) {
-			return null;
-		}
-		return (IDSService) childNodesList.get(0);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#addPropertiesElement(org.eclipse.pde.internal.ds.core.IDSProperties)
-	 */
-	public void addPropertiesElement(IDSProperties properties) {
-		this.addChildNode(properties, true);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#addPropertyElement(org.eclipse.pde.internal.ds.core.IDSProperty)
-	 */
-	public void addPropertyElement(IDSProperty property) {
-		this.addChildNode(property, true);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#addReference(org.eclipse.pde.internal.ds.core.IDSReference)
-	 */
-	public void addReference(IDSReference reference) {
-		this.addChildNode(reference, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSRoot#removePropertiesElement(org.eclipse.pde.internal.ds.core.IDSProperties)
-	 */
-	public void removePropertiesElement(IDSProperties properties) {
-		this.removeChildNode(properties, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#removePropertyElement(org.eclipse.pde.internal.ds.core.IDSProperty)
-	 */
-	public void removePropertyElement(IDSProperty property) {
-		this.removeChildNode(property, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#removeReference(org.eclipse.pde.internal.ds.core.IDSReference)
-	 */
-	public void removeReference(IDSReference reference) {
-		this.removeChildNode(reference, true);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#setImplementation(org.eclipse.pde.internal.ds.core.IDSImplementation)
-	 */
-	public void setImplementation(IDSImplementation implementation) {
-		if (this.getImplementation() == null) {
-			this.addChildNode(implementation, true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#setService(org.eclipse.pde.internal.ds.core.IDSService)
-	 */
-	public void setService(IDSService service) {
-		if (this.getService() == null) {
-			this.addChildNode(service, true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSComponent#removeService(org.eclipse.pde.internal.ds.core.IDSService)
-	 */
-	public void removeService(IDSService service) {
-		this.removeChildNode(service, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.IDSObject#getAttributesNames()
-	 */
-	public String[] getAttributesNames() {
-		return new String[] { IDSConstants.ATTRIBUTE_COMPONENT_ENABLED,
-				IDSConstants.ATTRIBUTE_COMPONENT_FACTORY,
-				IDSConstants.ATTRIBUTE_COMPONENT_IMMEDIATE,
-				IDSConstants.ATTRIBUTE_COMPONENT_NAME,
-				IDSConstants.ATTRIBUTE_COMPONENT_CONFIGURATION_POLICY,
-				IDSConstants.ATTRIBUTE_COMPONENT_ACTIVATE,
-				IDSConstants.ATTRIBUTE_COMPONENT_DEACTIVATE,
-				IDSConstants.ATTRIBUTE_COMPONENT_MODIFIED };
-	}
-
-	public String getConfigurationPolicy() {
-		return getXMLAttributeValue(ATTRIBUTE_COMPONENT_CONFIGURATION_POLICY);
-	}
-
-	public void setConfigurationPolicy(String policy) {
-		setXMLAttribute(ATTRIBUTE_COMPONENT_CONFIGURATION_POLICY, policy);
-	}
-
-	public String getActivateMethod() {
-		return getXMLAttributeValue(ATTRIBUTE_COMPONENT_ACTIVATE);
-	}
-
-	public String getDeactivateMethod() {
-		return getXMLAttributeValue(ATTRIBUTE_COMPONENT_DEACTIVATE);
-	}
-
-	public void setActivateMethod(String name) {
-		setXMLAttribute(ATTRIBUTE_COMPONENT_ACTIVATE, name);
-	}
-
-	public void setDeactivateMethod(String name) {
-		setXMLAttribute(ATTRIBUTE_COMPONENT_DEACTIVATE, name);
-	}
-
-	public String getModifiedMethod() {
-		return getXMLAttributeValue(ATTRIBUTE_COMPONENT_MODIFIED);
-	}
-
-	public void setModifiedeMethod(String name) {
-		setXMLAttribute(ATTRIBUTE_COMPONENT_MODIFIED, name);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
deleted file mode 100644
index ccb9ad9..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.pde.internal.core.text.DocumentNodeFactory;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentNodeFactory;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-/**
- * Handles the creation of document nodes representing the types of elements
- * that can exist in a declarative services xml file.
- * 
- * @since 3.4
- * @see DSModel
- * @see DSDocumentHandler
- */
-public class DSDocumentFactory extends DocumentNodeFactory implements
-		IDocumentNodeFactory, IDSDocumentFactory {
-	private DSModel fModel;
-
-	public DSDocumentFactory(DSModel model) {
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.IDocumentNodeFactory#createDocumentNode(java.lang.String,
-	 *      org.eclipse.pde.internal.core.text.IDocumentElementNode)
-	 */
-	public IDocumentElementNode createDocumentNode(String name,
-			IDocumentElementNode parent) {
-
-		// TODO this logic needs to be pushed up somehow... we shouldn't care
-		// about the namespace prefix
-		int index = name.indexOf(":"); //$NON-NLS-1$
-		if (index != -1) {
-			name = name.substring(index + 1);
-		}
-
-		if (isRoot(name)) { // Root
-			return (IDocumentElementNode) createComponent();
-		}
-
-		if (parent.getXMLTagName().equals(IDSConstants.ELEMENT_COMPONENT)) {
-			if (isImplementation(name)) {
-				return (IDocumentElementNode) createImplementation();
-			}
-			if (isProperties(name)) {
-				return (IDocumentElementNode) createProperties();
-			}
-			if (isProperty(name)) {
-				return (IDocumentElementNode) createProperty();
-			}
-			if (isService(name)) {
-				return (IDocumentElementNode) createService();
-			}
-			if (isReference(name)) {
-				return (IDocumentElementNode) createReference();
-			}
-		}
-
-		if (parent.getXMLTagName().equals(IDSConstants.ELEMENT_SERVICE)) {
-			if (isProvide(name)) {
-				return (IDocumentElementNode) createProvide();
-			}
-		}
-
-		return super.createDocumentNode(name, parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSDocumentFactory#createProvide()
-	 */
-	public IDSProvide createProvide() {
-		return new DSProvide(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSDocumentFactory#createProperty()
-	 */
-	public IDSProperty createProperty() {
-		return new DSProperty(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSDocumentFactory#createReference()
-	 */
-	public IDSReference createReference() {
-		return new DSReference(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSDocumentFactory#createService()
-	 */
-	public IDSService createService() {
-		return new DSService(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSDocumentFactory#createProperties()
-	 */
-	public IDSProperties createProperties() {
-		return new DSProperties(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSDocumentFactory#createImplementation()
-	 */
-	public IDSImplementation createImplementation() {
-		return new DSImplementation(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSDocumentFactory#createComponent()
-	 */
-	public IDSComponent createComponent() {
-		return new DSComponent(fModel);
-	}
-
-	private boolean isReference(String name) {
-		return name.equals(IDSConstants.ELEMENT_REFERENCE);
-	}
-
-	private boolean isService(String name) {
-		return name.equals(IDSConstants.ELEMENT_SERVICE);
-	}
-
-	private boolean isProperties(String name) {
-		return name.equals(IDSConstants.ELEMENT_PROPERTIES);
-	}
-
-	private boolean isImplementation(String name) {
-		return name.equals(IDSConstants.ELEMENT_IMPLEMENTATION);
-	}
-
-	private boolean isRoot(String name) {
-		return name.equals(IDSConstants.ELEMENT_COMPONENT);
-	}
-
-	private boolean isProperty(String name) {
-		return name.equals(IDSConstants.ELEMENT_PROPERTY);
-	}
-
-	private boolean isProvide(String name) {
-		return name.equals(IDSConstants.ELEMENT_PROVIDE);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java
deleted file mode 100644
index 6746bb9..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentHandler.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentNodeFactory;
-import org.eclipse.pde.internal.core.text.NodeDocumentHandler;
-
-/**
- * Document handler for declarative services xml files.
- * 
- * @since 3.4
- * @see DSModel
- * @see DSDocumentFactory
- */
-public class DSDocumentHandler extends NodeDocumentHandler {
-
-	private DSModel fModel;
-
-	public DSDocumentHandler(DSModel model, boolean reconciling) {
-		super(reconciling, (IDocumentNodeFactory) model.getFactory());
-		fModel = model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.text.DocumentHandler#getDocument()
-	 */
-	protected IDocument getDocument() {
-		return fModel.getDocument();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.text.NodeDocumentHandler#getRootNode()
-	 */
-	protected IDocumentElementNode getRootNode() {
-		return (IDocumentElementNode) fModel.getRoot();
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSImplementation.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSImplementation.java
deleted file mode 100644
index 0cfd91b..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSImplementation.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-
-/**
- * Represents the component implementation class
- * 
- * @since 3.4
- * @see IDSComponent
- * @see IDSObject
- * 
- */
-public class DSImplementation extends DSObject implements IDSImplementation {
-
-	private static final long serialVersionUID = 1L;
-
-	public DSImplementation(DSModel model) {
-		super(model, ELEMENT_IMPLEMENTATION);
-		this.setClassName(IDSConstants.ELEMENT_IMPLEMENTATION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getName()
-	 */
-	public String getName() {
-		return getClassName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_IMPLEMENTATION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSImplementation#setClassName(java.lang.String)
-	 */
-	public void setClassName(String className) {
-		setXMLAttribute(ATTRIBUTE_IMPLEMENTATION_CLASS, className);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSImplementation#getClassName()
-	 */
-	public String getClassName() {
-		return getXMLAttributeValue(ATTRIBUTE_IMPLEMENTATION_CLASS);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getClassName()
-	 */
-	public String[] getAttributesNames() {
-		return new String[] { IDSConstants.ATTRIBUTE_IMPLEMENTATION_CLASS };
-	}
-
-	public boolean isLeafNode() {
-		return true;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSModel.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSModel.java
deleted file mode 100644
index a7cf3eb..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSModel.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738 
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IWritable;
-import org.eclipse.pde.internal.core.text.XMLEditingModel;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Model describing the elements of a declarative services xml file.
- * 
- * @since 3.4
- */
-public class DSModel extends XMLEditingModel implements IDSModel {
-
-	private DSDocumentHandler fHandler;
-	private IDSDocumentFactory fFactory;
-	private IDSComponent fComponent;
-
-	public DSModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.text.XMLEditingModel#createDocumentHandler(org.eclipse.pde.core.IModel, boolean)
-	 */
-	protected DefaultHandler createDocumentHandler(IModel model, boolean reconciling) {
-		if (fHandler == null) {
-			fHandler = new DSDocumentHandler(this, reconciling);
-		}
-		return fHandler;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSModel#getFactory()
-	 */
-	public IDSDocumentFactory getFactory() {
-		if (fFactory == null) {
-			fFactory = new DSDocumentFactory(this);
-		}
-		return fFactory;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSModel#getDSRoot()
-	 */
-	public IDSComponent getDSComponent() {
-		if (fComponent == null) {
-			fComponent = getFactory().createComponent();
-		}
-		return fComponent;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.text.XMLEditingModel#getRoot()
-	 */
-	protected IWritable getRoot() {
-		return (IWritable) getDSComponent();
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSObject.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSObject.java
deleted file mode 100644
index c74ce57..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSObject.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import java.io.Serializable;
-
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.core.text.DocumentObject;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-
-/**
- * All modeled objects of a declarative services xml file must extend from this
- * abstract class.
- * 
- * @since 3.4
- * @see DSModel
- * @see DSDocumentFactory
- */
-public abstract class DSObject extends DocumentObject implements IDSConstants,
-		Serializable, IDSObject {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs the DSObject and initializes its attributes.
-	 * 
-	 * @param model
-	 *            The model to associate with this DSObject
-	 * @param tagName
-	 *            The xml tag name for this object
-	 */
-	public DSObject(DSModel model, String tagName) {
-		super(model, tagName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.DocumentElementNode#getAttributeIndent()
-	 */
-	protected String getAttributeIndent() {
-		return " "; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.DocumentElementNode#getContentIndent()
-	 */
-	protected String getContentIndent() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#canBeParent()
-	 */
-	public abstract boolean canBeParent();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-	public abstract boolean canAddChild(int objectType);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getModel()
-	 */
-	public IDSModel getModel() {
-		final IModel sharedModel = getSharedModel();
-		if (sharedModel instanceof DSModel) {
-			return (DSModel) sharedModel;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getRoot()
-	 */
-	public IDSComponent getComponent() {
-		final IDSModel model = getModel();
-		if (model != null) {
-			return model.getDSComponent();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getName()
-	 */
-	public abstract String getName();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getType()
-	 */
-	public abstract int getType();
-	
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperties.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperties.java
deleted file mode 100644
index 32b5bd6..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperties.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-
-/**
- * Represents a set of properties from a bundle entry
- * 
- * @since 3.4
- * @see DSObject
- * @see DSComponent
- * @see DSModel
- */
-public class DSProperties extends DSObject implements IDSProperties {
-
-	private static final long serialVersionUID = 1L;
-	
-	public DSProperties(DSModel model) {
-		super(model, ELEMENT_PROPERTIES);
-		int number = model.getDSComponent().getPropertiesElements().length + 1;
-		this.setEntry(IDSConstants.ATTRIBUTE_PROPERTIES_ENTRY
-				+ number);
-		setInTheModel(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getName()
-	 */
-	public String getName() {
-		return getEntry();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_PROPERTIES;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperties#setEntry(java.lang.String)
-	 */
-	public void setEntry(String entry){
-		setXMLAttribute(ATTRIBUTE_PROPERTIES_ENTRY, entry);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperties#getEntry()
-	 */
-	public String getEntry(){
-		return getXMLAttributeValue(ATTRIBUTE_PROPERTIES_ENTRY);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.IDSObject#getAttributesNames()
-	 */
-	public String[] getAttributesNames() {
-		return new String[] { IDSConstants.ATTRIBUTE_PROPERTIES_ENTRY };
-	}
-
-	public boolean isLeafNode() {
-		return true;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperty.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperty.java
deleted file mode 100644
index 40ef901..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProperty.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-
-public class DSProperty extends DSObject implements IDSProperty {
-
-	private static final long serialVersionUID = 1L;
-	public DSProperty(DSModel model) {
-		super(model, ELEMENT_PROPERTY);
-		
-		// set Default Values
-		this.setPropertyType(IDSConstants.VALUE_PROPERTY_TYPE_STRING);
-		int property_count = model.getDSComponent().getPropertyElements().length + 1;
-		this.setPropertyName(IDSConstants.ELEMENT_PROPERTY + property_count);
-		this.setPropertyValue(IDSConstants.ATTRIBUTE_PROPERTY_VALUE);
-		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getName()
-	 */
-	public String getName() {
-		return getPropertyName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_PROPERTY;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#getPropertyName()
-	 */
-	public String getPropertyName(){
-		return getXMLAttributeValue(ATTRIBUTE_PROPERTY_NAME);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#setPropertyName(java.lang.String)
-	 */
-	public void setPropertyName(String name){
-		setXMLAttribute(ATTRIBUTE_PROPERTY_NAME, name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#getPropertyValue()
-	 */
-	public String getPropertyValue(){
-		return getXMLAttributeValue(ATTRIBUTE_PROPERTY_VALUE);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#setPropertyValue(java.lang.String)
-	 */
-	public void setPropertyValue(String value){
-		setXMLAttribute(ATTRIBUTE_PROPERTY_VALUE, value);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#getPropertyType()
-	 */
-	public String getPropertyType(){
-		return getXMLAttributeValue(ATTRIBUTE_PROPERTY_TYPE);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#setPropertyType(java.lang.String)
-	 */
-	public void setPropertyType(String type){
-		setXMLAttribute(ATTRIBUTE_PROPERTY_TYPE, type);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#getPropertyElemBody()
-	 */
-	public String getPropertyElemBody() {
-		return getXMLContent(); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProperty#setPropertyElemBody(java.lang.String)
-	 */
-	public void setPropertyElemBody(String body){
-		setXMLContent(body);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.IDSObject#getAttributesNames()
-	 */
-	public String[] getAttributesNames() {
-		return new String[] { IDSConstants.ATTRIBUTE_PROPERTY_NAME,
-				IDSConstants.ATTRIBUTE_PROPERTY_TYPE,
-				IDSConstants.ATTRIBUTE_PROPERTY_VALUE };
-	}
-
-	public boolean isLeafNode() {
-		return true;
-	}
-	
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProvide.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProvide.java
deleted file mode 100644
index 1608da7..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSProvide.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-
-public class DSProvide extends DSObject implements IDSProvide {
-
-	private static final long serialVersionUID = 1L;
-	
-	public DSProvide(DSModel model) {
-		super(model, ELEMENT_PROVIDE);
-		
-		int prov_count = model.getDSComponent().getService()
-				.getProvidedServices().length + 1;
-		this.setInterface(IDSConstants.ATTRIBUTE_PROVIDE_INTERFACE
-				+ prov_count);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#getName()
-	 */
-	public String getName() {
-		return getInterface();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_PROVIDE;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProvide#setInterface(java.lang.String)
-	 */
-	public void setInterface(String interfaceName){
-		setXMLAttribute(ATTRIBUTE_PROVIDE_INTERFACE, interfaceName);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSProvide#getInterface()
-	 */
-	public String getInterface(){
-		return getXMLAttributeValue(ATTRIBUTE_PROVIDE_INTERFACE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.IDSObject#getAttributesNames()
-	 */
-	public String[] getAttributesNames() {
-		return new String[] { IDSConstants.ATTRIBUTE_PROVIDE_INTERFACE };
-	}
-
-	public boolean isLeafNode() {
-		return true;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSReference.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSReference.java
deleted file mode 100644
index 07c2941..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSReference.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-
-public class DSReference extends DSObject implements IDSReference {
-
-	private static final long serialVersionUID = 1L;
-
-	public DSReference(DSModel model) {
-		super(model, ELEMENT_REFERENCE);
-		
-		// set default values
-		this
-				.setReferenceCardinality(IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_ONE);
-		this.setReferencePolicy(IDSConstants.VALUE_REFERENCE_POLICY_STATIC);
-		
-		// set generic values
-		int ref_count = model.getDSComponent().getReferences().length + 1;
-		this
-				.setReferenceName(IDSConstants.ELEMENT_REFERENCE
-						+ ref_count);
-		this.setReferenceInterface(IDSConstants.ATTRIBUTE_REFERENCE_INTERFACE
-				+ ref_count);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#getName()
-	 */
-	public String getName() {
-		return getReferenceName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_REFERENCE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#setReferenceName(java.lang.String)
-	 */
-	public void setReferenceName(String name){
-		setXMLAttribute(ATTRIBUTE_REFERENCE_NAME, name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#getReferenceName()
-	 */
-	public String getReferenceName(){
-		return getXMLAttributeValue(ATTRIBUTE_REFERENCE_NAME);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#setReferenceInterface(java.lang.String)
-	 */
-	public void setReferenceInterface(String interfaceName){
-		setXMLAttribute(ATTRIBUTE_REFERENCE_INTERFACE, interfaceName);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#getReferenceInterface()
-	 */
-	public String getReferenceInterface(){
-		return getXMLAttributeValue(ATTRIBUTE_REFERENCE_INTERFACE);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#setReferenceCardinality(java.lang.String)
-	 */
-	public void setReferenceCardinality(String cardinality){
-		setXMLAttribute(ATTRIBUTE_REFERENCE_CARDINALITY, cardinality);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#getReferenceCardinality()
-	 */
-	public String getReferenceCardinality(){
-		return getXMLAttributeValue(ATTRIBUTE_REFERENCE_CARDINALITY);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#setReferencePolicy(java.lang.String)
-	 */
-	public void setReferencePolicy(String policy){
-		setXMLAttribute(ATTRIBUTE_REFERENCE_POLICY, policy);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#getReferencePolicy()
-	 */
-	public String getReferencePolicy(){
-		return getXMLAttributeValue(ATTRIBUTE_REFERENCE_POLICY);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#setReferenceTarget(java.lang.String)
-	 */
-	public void setReferenceTarget(String target){
-		setXMLAttribute(ATTRIBUTE_REFERENCE_TARGET, target);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#getReferenceTarget()
-	 */
-	public String getReferenceTarget(){
-		return getXMLAttributeValue(ATTRIBUTE_REFERENCE_TARGET);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#setReferenceBind(java.lang.String)
-	 */
-	public void setReferenceBind(String bind){
-		setXMLAttribute(ATTRIBUTE_REFERENCE_BIND, bind);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#getReferenceBind()
-	 */
-	public String getReferenceBind(){
-		return getXMLAttributeValue(ATTRIBUTE_REFERENCE_BIND);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#setReferenceUnbind(java.lang.String)
-	 */
-	public void setReferenceUnbind(String unbind){
-		setXMLAttribute(ATTRIBUTE_REFERENCE_UNBIND, unbind);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSReference#getReferenceUnbind()
-	 */
-	public String getReferenceUnbind(){
-		return getXMLAttributeValue(ATTRIBUTE_REFERENCE_UNBIND);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.IDSObject#getAttributesNames()
-	 */
-	public String[] getAttributesNames() {
-		return new String[] { IDSConstants.ATTRIBUTE_REFERENCE_BIND,
-				IDSConstants.ATTRIBUTE_REFERENCE_CARDINALITY,
-				IDSConstants.ATTRIBUTE_REFERENCE_INTERFACE,
-				IDSConstants.ATTRIBUTE_REFERENCE_NAME,
-				IDSConstants.ATTRIBUTE_REFERENCE_POLICY,
-				IDSConstants.ATTRIBUTE_REFERENCE_TARGET,
-				IDSConstants.ATTRIBUTE_REFERENCE_UNBIND };
-	}
-
-	public boolean isLeafNode() {
-		return true;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSService.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSService.java
deleted file mode 100644
index f50b0e0..0000000
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSService.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com> - bug 223738
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.core.text;
-
-import java.util.ArrayList;
-
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-public class DSService extends DSObject implements IDSService {
-
-	private static final long serialVersionUID = 1L;
-
-	public DSService(DSModel model) {
-		super(model, ELEMENT_SERVICE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canAddChild(int)
-	 */
-
-	public boolean canAddChild(int objectType) {
-		return objectType == TYPE_PROVIDE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#getName()
-	 */
-	public String getName() {
-		return IDSConstants.ELEMENT_SERVICE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.DSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_SERVICE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSService#setServiceFactory(boolean)
-	 */
-	public void setServiceFactory(boolean bool) {
-		setBooleanAttributeValue(ATTRIBUTE_SERVICE_FACTORY, bool);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSService#getServiceFactory()
-	 */
-	public boolean getServiceFactory() {
-		return getBooleanAttributeValue(ATTRIBUTE_SERVICE_FACTORY, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSService#getProvidedServices()
-	 */
-	public IDSProvide[] getProvidedServices() {
-		ArrayList childNodesList = getChildNodesList(IDSProvide.class, true);
-		IDSProvide[] providedServices = new IDSProvide[childNodesList.size()];
-		for (int i = 0; i < childNodesList.size(); i++) {
-			providedServices[i] = (IDSProvide) childNodesList.get(i);
-		}
-		return providedServices;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSService#addProvidedService(org.eclipse.pde.internal.ds.core.IDSProvide)
-	 */
-	public void addProvidedService(IDSProvide provide) {
-		this.addChildNode(provide, true);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.text.IDSService#removeProvidedService(org.eclipse.pde.internal.ds.core.IDSProvide)
-	 */
-	public void removeProvidedService(IDSProvide provide) {
-		this.removeChildNode(provide, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ds.core.IDSObject#getAttributesNames()
-	 */
-	public String[] getAttributesNames() {
-		return new String[] { IDSConstants.ATTRIBUTE_SERVICE_FACTORY };
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.tests/.classpath b/ds/org.eclipse.pde.ds.tests/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/ds/org.eclipse.pde.ds.tests/.classpath
+++ /dev/null

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

diff --git a/ds/org.eclipse.pde.ds.tests/.cvsignore b/ds/org.eclipse.pde.ds.tests/.cvsignore
deleted file mode 100644
index 3aef9b8..0000000
--- a/ds/org.eclipse.pde.ds.tests/.cvsignore
+++ /dev/null

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

diff --git a/ds/org.eclipse.pde.ds.tests/.project b/ds/org.eclipse.pde.ds.tests/.project
deleted file mode 100644
index f7310d4..0000000
--- a/ds/org.eclipse.pde.ds.tests/.project
+++ /dev/null

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

@@ -1,268 +0,0 @@
-#Tue Mar 03 18:36:09 CST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/ds/org.eclipse.pde.ds.tests/.settings/org.eclipse.jdt.ui.prefs b/ds/org.eclipse.pde.ds.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 847be1c..0000000
--- a/ds/org.eclipse.pde.ds.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,109 +0,0 @@
-#Tue Mar 03 18:36:08 CST 2009
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=11
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ds/org.eclipse.pde.ds.tests/All DS Tests.launch b/ds/org.eclipse.pde.ds.tests/All DS Tests.launch
deleted file mode 100644
index ff5467e..0000000
--- a/ds/org.eclipse.pde.ds.tests/All DS Tests.launch
+++ /dev/null

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>
-<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
-<listEntry value="/org.eclipse.pde.ds.core/bin"/>
-<listEntry value="/org.eclipse.pde.ds.ui/bin"/>
-</listAttribute>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AllDSModelTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.pde.internal.ds.tests.AllDSModelTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.pde.ds.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>

diff --git a/ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index a2d43a7..0000000
--- a/ds/org.eclipse.pde.ds.tests/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.ds.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.pde.internal.ds.tests.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
- org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.ds.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.text;bundle-version="[3.3.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName

diff --git a/ds/org.eclipse.pde.ds.tests/about.html b/ds/org.eclipse.pde.ds.tests/about.html
deleted file mode 100644
index 4602330..0000000
--- a/ds/org.eclipse.pde.ds.tests/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ds/org.eclipse.pde.ds.tests/build.properties b/ds/org.eclipse.pde.ds.tests/build.properties
deleted file mode 100644
index 1c21e18..0000000
--- a/ds/org.eclipse.pde.ds.tests/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html,\
-               test.xml

diff --git a/ds/org.eclipse.pde.ds.tests/plugin.properties b/ds/org.eclipse.pde.ds.tests/plugin.properties
deleted file mode 100644
index d85f05b..0000000
--- a/ds/org.eclipse.pde.ds.tests/plugin.properties
+++ /dev/null

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

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java
deleted file mode 100644
index dd6f5cb..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AbstractDSModelTestCase.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.pde.internal.core.text.IModelTextChangeListener;
-import org.eclipse.pde.internal.core.text.plugin.XMLTextChangeListener;
-import org.eclipse.pde.internal.ds.core.text.DSModel;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-
-public abstract class AbstractDSModelTestCase extends TestCase {
-
-	protected static final String LF = "\n"; //$NON-NLS-1$
-	protected static final String CR = "\r"; //$NON-NLS-1$
-	protected static final String CRLF = CR + LF;
-	
-	public static final String COMPONENT_NAME = "sample"; //$NON-NLS-1$
-	
-	protected Document fDocument;
-	protected DSModel fModel;
-	protected IModelTextChangeListener fListener;
-
-	public AbstractDSModelTestCase() {
-	}
-
-	protected void setUp() throws Exception {
-		fDocument = new Document();
-	}
-
-	protected void load() {
-		load(false);
-	}
-
-	protected void load(boolean addListener) {
-		try {
-			fModel = new DSModel(fDocument, false);
-			fModel.load();
-			if (!fModel.isLoaded() || !fModel.isValid())
-				fail("model cannot be loaded");
-			if (addListener) {
-				fListener = new XMLTextChangeListener(fModel.getDocument());
-				fModel.addModelChangedListener(fListener);
-			}
-		} catch (CoreException e) {
-			fail("model cannot be loaded");
-		}
-	}
-	
-	protected void setXMLContents(StringBuffer body, String newline) {
-		StringBuffer sb = new StringBuffer();
-		sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		sb.append(newline);
-		sb.append("<scr:component xmlns:scr=\"http://www.osgi.org/xmlns/scr/v1.1.0\" name=\"" + COMPONENT_NAME + "\">");
-		sb.append(newline);
-		if (body != null)
-			sb.append(body.toString());
-		sb.append(newline);
-		sb.append("</scr:component>");
-		sb.append(newline);
-		fDocument.set(sb.toString());
-	}
-
-	protected void reload() {
-		TextEdit[] ops = fListener.getTextOperations();
-		if (ops.length == 0)
-			return;
-		MultiTextEdit multi = new MultiTextEdit();
-		multi.addChildren(ops);
-		try {
-			multi.apply(fDocument);
-		} catch (MalformedTreeException e) {
-			fail(e.getMessage());
-		} catch (BadLocationException e) {
-			fail(e.getMessage());
-		}
-		load();
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/Activator.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/Activator.java
deleted file mode 100644
index 9a483a1..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/Activator.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.pde.internal.ds.tests";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AllDSModelTests.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AllDSModelTests.java
deleted file mode 100644
index 2ef4ddc..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/AllDSModelTests.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllDSModelTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for org.eclipse.pde.ds.core"); //$NON-NLS-1$
-		suite.addTestSuite(DSComponentTestCase.class);
-		suite.addTestSuite(DSServiceTestCase.class);
-		suite.addTestSuite(DSReferenceTestCase.class);
-		suite.addTestSuite(DSProvideTestCase.class);
-		suite.addTestSuite(DSPropertyTestCase.class);
-		suite.addTestSuite(DSPropertiesTestCase.class);
-		suite.addTestSuite(DSImplementationTestCase.class);
-		suite.addTestSuite(DSObjectTestCase.class);
-		suite.addTestSuite(DSv10tov11TestCase.class);
-		return suite;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSComponentTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSComponentTestCase.java
deleted file mode 100644
index 995c988..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSComponentTestCase.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-public class DSComponentTestCase extends AbstractDSModelTestCase {
-
-	public void testAddDefaultComponent() {
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-
-		assertEquals(component.getName(), COMPONENT_NAME);
-		assertEquals(component.getActivateMethod(), null);
-		assertEquals(component.getDeactivateMethod(), null);
-		assertEquals(component.getModifiedMethod(), null);
-
-		assertTrue(component.getEnabled());
-	}
-
-	public void testAddComponentwithAllAttributes() {
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-
-		assertEquals(component.getName(), COMPONENT_NAME);
-		component.setEnabled(false);
-		component.setAttributeName("NewName");
-		component.setFactory("NewFactory");
-		component.setImmediate(true);
-		component.setActivateMethod("start");
-		component.setDeactivateMethod("stop");
-		component.setModifiedeMethod("modified");
-
-		assertFalse(component.getEnabled());
-		assertEquals(component.getAttributeName(), "NewName");
-		assertEquals(component.getFactory(), "NewFactory");
-		assertTrue(component.getImmediate());
-		assertEquals(component.getActivateMethod(), "start");
-		assertEquals(component.getDeactivateMethod(), "stop");
-		assertEquals(component.getModifiedMethod(), "modified");
-	}
-
-	public void testAddMoveRemoveChildrens() {
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-
-		IDSDocumentFactory factory = fModel.getFactory();
-
-		IDSImplementation implementation = factory.createImplementation();
-		implementation.setClassName("ImplementationClassName");
-		component.setImplementation(implementation);
-
-		IDSProperties properties = factory.createProperties();
-		properties.setEntry("PropertiesEntry");
-		component.addPropertiesElement(properties);
-
-		IDSProperty property = factory.createProperty();
-		property.setPropertyElemBody("Body Values");
-		property.setPropertyType("java.lang.String");
-		component.addPropertyElement(property);
-
-		IDSService service = factory.createService();
-		service.setServiceFactory(true);
-		component.setService(service);
-
-		IDSReference reference = factory.createReference();
-		reference.setReferenceBind("methodBind");
-		reference.setReferenceUnbind("methodUnBind");
-		reference.setReferenceInterface("ReferenceInterface");
-		reference.setReferenceName("ReferenceName");
-		component.addReference(reference);
-
-		IDocumentElementNode childAt4 = component.getChildAt(4);
-		component.moveChildNode(reference, -1, true);
-
-		IDocumentElementNode childAt3 = component.getChildAt(3);
-
-		assertEquals(childAt4, childAt3);
-
-		assertTrue(component.getChildCount() == 5);
-		assertTrue(component.getImplementation() != null);
-		assertTrue(component.getPropertyElements().length == 1);
-		assertTrue(component.getPropertiesElements().length == 1);
-		assertTrue(component.getService() != null);
-		assertTrue(component.getReferences().length == 1);
-
-		component.removeReference(reference);
-		assertTrue(component.getChildCount() == 4);
-		assertTrue(component.getImplementation() != null);
-		assertTrue(component.getPropertyElements().length == 1);
-		assertTrue(component.getPropertiesElements().length == 1);
-		assertTrue(component.getService() != null);
-		assertTrue(component.getReferences().length == 0);
-
-		component.removeService(service);
-		component.removePropertiesElement(properties);
-		assertTrue(component.getChildCount() == 2);
-		assertTrue(component.getImplementation() != null);
-		assertTrue(component.getPropertyElements().length == 1);
-		assertTrue(component.getPropertiesElements().length == 0);
-		assertTrue(component.getService() == null);
-		assertTrue(component.getReferences().length == 0);
-
-		component.removeChildNode(implementation);
-		component.removePropertyElement(property);
-		assertTrue(component.getChildCount() == 0);
-		assertTrue(component.getImplementation() == null);
-		assertTrue(component.getPropertyElements().length == 0);
-		assertTrue(component.getPropertiesElements().length == 0);
-		assertTrue(component.getService() == null);
-		assertTrue(component.getReferences().length == 0);
-
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java
deleted file mode 100644
index 48960c1..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Rafael Oliveira Nóbrega <rafael.oliveira@gmail.com>
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-
-public class DSImplementationTestCase extends AbstractDSModelTestCase {
-
-	public void testAddImplementationComponent() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<implementation class=\"");
-		buffer.append("org.example.ds.SampleCommandProvider1\">");
-		buffer.append("</implementation>");
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-
-		IDSImplementation implementation = component.getImplementation();
-		assertTrue(implementation != null);
-
-		String className = implementation.getClassName();
-		assertTrue(className.equals("org.example.ds.SampleCommandProvider1"));
-		
-		assertEquals(implementation.getName(), className);
-	}
-
-
-	/**
-	 * Tests a service component default values
-	 */
-	public void testDefaultValuesService() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<implementation>");
-		buffer.append(LF);
-		buffer.append("</implementation>");
-
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-
-		IDSImplementation implementation = component.getImplementation();
-		assertNotNull(implementation);
-		assertTrue(implementation.getClassName() == null);
-	}
-
-	/**
-	 * Tests to add a implementation by DSDocumentFactory
-	 */
-	public void testAddImplementationFactory() {
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSDocumentFactory factory = fModel.getFactory();
-		IDSImplementation Implementation = factory.createImplementation();
-		String className = "org.example.ds.SampleCommandProvider";
-		Implementation.setClassName(className);
-
-		IDSComponent component = fModel.getDSComponent();
-		component.setImplementation(Implementation);
-
-		String content = component.toString();
-		assertTrue(content.indexOf("class=\"" + className + "\"") != -1);
-
-		IDSImplementation Implementation0 = component.getImplementation();
-		assertNotNull(Implementation0);
-		assertTrue(Implementation0.getClassName().equals(className));
-
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSObjectTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSObjectTestCase.java
deleted file mode 100644
index ced35d4..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSObjectTestCase.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import java.util.List;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-public class DSObjectTestCase extends AbstractDSModelTestCase {
-
-
-	public void testObject(){
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		
-		IDSDocumentFactory factory = fModel.getFactory();
-		
-		IDSImplementation implementation = factory.createImplementation();
-		implementation.setClassName("ImplementationClassName");
-		component.setImplementation(implementation);
-		
-		IDSProperties properties = factory.createProperties();
-		properties.setEntry("PropertiesEntry");
-		component.addPropertiesElement(properties);
-		
-		IDSProperty property = factory.createProperty();
-		property.setPropertyElemBody("Body Values");
-		property.setPropertyType("java.lang.String");
-		component.addPropertyElement(property);
-		
-		IDSService service = factory.createService();
-		service.setServiceFactory(true);
-		component.setService(service);
-		
-		IDSReference reference = factory.createReference();
-		reference.setReferenceBind("methodBind");
-		reference.setReferenceUnbind("methodUnBind");
-		reference.setReferenceInterface("ReferenceInterface");
-		reference.setReferenceName("ReferenceName");
-		component.addReference(reference);
-		
-		List children = component.getChildNodesList();
-		assertTrue(children.size() == 5);
-		assertEquals(component.getModel(), fModel);
-		
-		IDSObject child = (IDSObject)children.get(0);
-		assertEquals(child.getComponent(), component);
-		
-		assertEquals(child.getParentNode(), component);
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java
deleted file mode 100644
index 1a6e8f6..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-
-public class DSPropertiesTestCase extends AbstractDSModelTestCase {
-	
-	public void testAddPropertiesComponent() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<properties entry=\"");
-		buffer.append("OSGI-INF/vendor.properties\">");
-		buffer.append("</properties>");
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		
-		IDSProperties[] propertiesElements = component.getPropertiesElements();
-		assertTrue(propertiesElements.length==1);
-		
-		IDSProperties properties = propertiesElements[0];
-		String entry = properties.getEntry();
-		assertTrue(entry.equals("OSGI-INF/vendor.properties"));
-		
-		assertEquals(entry, properties.getName());
-	}
-	
-	/**
-	 * Tests a  component with multiple properties 
-	 */
-	public void testMultipleProperties() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<properties entry=\"");
-		buffer.append("OSGI-INF/vendor.properties1\">");
-		buffer.append("</properties>");
-
-		buffer.append(LF);
-		buffer.append("<properties entry=\"");
-		buffer.append("OSGI-INF/vendor.properties2\">");
-		buffer.append("</properties>");
-
-		buffer.append(LF);
-		buffer.append("<properties entry=\"");
-		buffer.append("OSGI-INF/vendor.properties3\">");
-		buffer.append("</properties>");
-
-		buffer.append(LF);
-		buffer.append("<properties entry=\"");
-		buffer.append("OSGI-INF/vendor.properties4\">");
-		buffer.append("</properties>");
-
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-
-		IDSProperties[] propertiesElements = component.getPropertiesElements();
-
-		assertTrue(propertiesElements.length == 4);
-		
-		for (int i = 0; i < 4; i++) {
-			IDSProperties properties = propertiesElements[i];
-
-			String entry = properties.getEntry();
-			assertTrue(entry.equals("OSGI-INF/vendor.properties" + (i+1)));
-		}
-
-	}
-
-	/**
-	 * Tests a properties component default values 
-	 */
-	public void testDefaultValuesService() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<properties>");
-		buffer.append(LF);
-		buffer.append("</properties>");
-
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		
-		IDSProperties[] propertiesElements = component.getPropertiesElements();
-		assertTrue(propertiesElements.length==1);
-		
-		IDSProperties properties = propertiesElements[0];
-		assertTrue(properties.getEntry() == null);
-	}
-	
-
-	
-	/**
-	 * Tests to add a properties by DSDocumentFactory
-	 */
-	public void testAddPropertiesFactory(){
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer , LF);
-		load();
-		
-		IDSDocumentFactory factory = fModel.getFactory();
-		IDSProperties Properties = factory.createProperties();
-		String entry = "OSGI-INF/vendor.propertiesFactory";
-		Properties.setEntry(entry);
-		
-		IDSComponent component = fModel.getDSComponent();
-		component.addPropertiesElement(Properties);
-		
-		String content = component.toString();
-		
-		assertTrue(content.indexOf("entry=\""+entry+"\"") != -1);
-		
-		IDSProperties[] PropertiesElements = component.getPropertiesElements();
-		IDSProperties Properties0 = PropertiesElements[0];
-		assertNotNull(Properties0);
-		assertTrue(Properties0.getEntry().equals(entry));
-		
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertyTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertyTestCase.java
deleted file mode 100644
index ca00934..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertyTestCase.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-
-public class DSPropertyTestCase extends AbstractDSModelTestCase {
-	
-	public void testAddProperty() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<property ");
-		buffer.append("/>");
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		
-		IDSProperty[] propertyElements = fModel.getDSComponent().getPropertyElements();
-		assertTrue(propertyElements.length == 1);
-		IDSProperty property = propertyElements[0];
-
-		String name = "propertyName";
-		String type = "java.lang.String";
-		String value = "propertyValue";
-		String body = "propertyBody";
-		
-		property.setPropertyName(name);
-		property.setPropertyType(type);
-		property.setPropertyValue(value);
-		property.setPropertyElemBody(body);
-		
-		assertEquals(property.getPropertyName(), name);
-		assertEquals(property.getPropertyType(), type);
-		assertEquals(property.getPropertyValue(), value);
-		assertEquals(property.getPropertyElemBody(), body);
-	}
-	
-	
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java
deleted file mode 100644
index 1bdb265..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-public class DSProvideTestCase extends AbstractDSModelTestCase {
-	
-	public void testAddCompleteProvidedService() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<service servicefactory=\"true\" >");
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable\">");
-		buffer.append("</provide>");
-		buffer.append(LF);
-		buffer.append("</service>");
-		setXMLContents(buffer, LF);
-		load();
-		
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		
-		IDSService service = fModel.getDSComponent().getService();
-		assertNotNull(service);
-		
-		IDSProvide[] providedServices = service.getProvidedServices();
-		assertTrue(providedServices.length == 1);
-		IDSProvide provide = providedServices[0];
-		assertTrue(provide.getInterface().equals("java.lang.Runnable"));
-		
-		String interfaceName = "java.lang.String";
-		provide.setInterface(interfaceName);
-		
-		String content = fModel.getDSComponent().toString();
-		assertTrue(content.indexOf(interfaceName) != -1);
-		
-		assertEquals(provide.getName(), interfaceName);
-		
-	}
-	
-	/**
-	 * Tests to add a provided service by DSDocumentFactory
-	 */	
-	public void testAddProvidedServicebyFactory() {
-			StringBuffer buffer = new StringBuffer();
-			setXMLContents(buffer , LF);
-			load();
-			
-			IDSDocumentFactory factory = fModel.getFactory();
-			IDSService service = factory.createService();
-			service.setServiceFactory(true);
-			
-			IDSComponent component = fModel.getDSComponent();
-			component.setService(service);
-			
-			IDSProvide provide = factory.createProvide();
-			provide.setInterface("java.lang.Runnable");
-			service.addProvidedService(provide);
-			
-			String content = component.toString();
-			
-			assertTrue(content.indexOf("interface=\"java.lang.Runnable\"") != -1);
-			
-			IDSService service0 = component.getService();
-			assertNotNull(service0);
-			assertTrue(service0.getServiceFactory());
-			IDSProvide[] providedServices = service.getProvidedServices();
-			
-			IDSProvide provide0 = providedServices[0];
-			assertNotNull(provide0);
-			assertTrue(provide0.getInterface().equals("java.lang.Runnable"));
-			
-			
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSReferenceTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSReferenceTestCase.java
deleted file mode 100644
index 84fa17a..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSReferenceTestCase.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-
-public class DSReferenceTestCase extends AbstractDSModelTestCase {
-
-	public void testServiceReference() {
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		IDSReference reference = fModel.getFactory().createReference();
-		String name = "HTTP";
-		String interfaceName = "org.osgi.service.http.HttpService";
-		String cardinality = "0..n";
-		String policy = "dynamic";
-		String bind = "setPage";
-		String unbind = "unsetPage";
-		String target = "(component.factory=acme.application)";
-
-		reference.setReferenceName(name);
-		reference.setReferenceInterface(interfaceName);
-		reference.setReferenceCardinality(cardinality);
-		reference.setReferencePolicy(policy);
-		reference.setReferenceBind(bind);
-		reference.setReferenceUnbind(unbind);
-
-		reference.setReferenceTarget(target);
-
-		component.addReference(reference);
-
-		IDSReference[] references = component.getReferences();
-
-		assertTrue(references.length == 1);
-
-		IDSReference reference0 = references[0];
-
-		assertEquals(reference0.getReferenceName(), name);
-		assertEquals(reference0.getReferenceInterface(), interfaceName);
-		assertEquals(reference0.getReferenceCardinality(), cardinality);
-		assertEquals(reference0.getReferencePolicy(), policy);
-		assertEquals(reference0.getReferenceBind(), bind);
-		assertEquals(reference0.getReferenceUnbind(), unbind);
-		assertEquals(reference0.getName(), name);
-
-	}
-
-	public void testDefaultServiceReference() {
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		IDSReference reference = fModel.getFactory().createReference();
-		component.addReference(reference);
-
-		IDSReference[] references = component.getReferences();
-
-		assertTrue(references.length == 1);
-
-		IDSReference reference0 = references[0];
-
-		String defautCardinality = "1..1";
-		String defaultPolicy = "static";
-		
-		assertEquals(reference0.getReferenceCardinality(), defautCardinality);
-		
-		assertEquals(reference0.getReferencePolicy(), defaultPolicy);
-
-		
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java
deleted file mode 100644
index b5d5798..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-public class DSServiceTestCase extends AbstractDSModelTestCase {
-
-	/**
-	 * Tests a service component with all Attributes and Child values
-	 */
-	public void testAddCompleteService() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<service servicefactory=\"true\" >");
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable\">");
-		buffer.append("</provide>");
-		buffer.append(LF);
-		buffer.append("</service>");
-
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSObject component = fModel.getDSComponent();
-
-		assertTrue(component.getChildCount() == 1);
-
-		IDocumentElementNode child = component.getChildAt(0);
-
-		assertTrue(child instanceof IDSService);
-
-		IDSService service = (IDSService) child;
-		assertTrue(service.getServiceFactory() == true);
-
-		assertTrue(child.getChildCount() == 1);
-		IDSProvide[] providedServices = service.getProvidedServices();
-
-		IDSProvide provide = providedServices[0];
-
-		String interface1 = provide.getInterface();
-
-		assertTrue(interface1.equals("java.lang.Runnable"));
-		
-		service.setServiceFactory(false);
-		
-		String string = fModel.getDSComponent().toString();
-		assertTrue(string.indexOf("servicefactory=\"false\"") != -1);
-		
-		assertTrue(service.getServiceFactory() == false);
-		
-		assertEquals(service.getName(), IDSConstants.ELEMENT_SERVICE);
-	}
-
-	/**
-	 * Tests a service component with multiple Childs 
-	 */
-	public void testMultipleProvideService() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<service>");
-
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable1\"/>");
-
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable2\"/>");
-
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable3\"/>");
-
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable4\"/>");
-
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable5\"/>");
-
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable6\"/> ");
-
-		buffer.append("</service>");
-
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSObject component = fModel.getDSComponent();
-
-		assertTrue(component.getChildCount() == 1);
-
-		IDocumentElementNode child = component.getChildAt(0);
-
-		assertTrue(child instanceof IDSService);
-
-		assertTrue(child.getChildCount() == 6);
-
-		for (int i = 0; i < 6; i++) {
-			IDocumentElementNode grandChild = child.getChildAt(i);
-
-			IDSProvide provide = (IDSProvide) grandChild;
-			String interface1 = provide.getInterface();
-			assertTrue(interface1.equals("java.lang.Runnable" + (i+1)));
-		}
-
-	}
-
-	/**
-	 * Tests a service component default values 
-	 */
-	public void testDefaultValuesService() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<service>");
-		buffer.append(LF);
-		buffer.append("</service>");
-
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSObject component = fModel.getDSComponent();
-
-		assertTrue(component.getChildCount() == 1);
-
-		IDocumentElementNode child = component.getChildAt(0);
-
-		assertTrue(child instanceof IDSService);
-
-		IDSService service = (IDSService) child;
-		assertTrue(service.getServiceFactory() == false);
-	}
-	
-	/**
-	 * Test to remove a provided service element from a service element.
-	 */
-	public void testRemoveChildService(){
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<service servicefactory=\"true\" >");
-		buffer.append(LF);
-		buffer.append("<provide interface=\"");
-		buffer.append("java.lang.Runnable\">");
-		buffer.append("</provide>");
-		buffer.append(LF);
-		buffer.append("</service>");
-
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		
-		IDSService service = component.getService();
-		assertNotNull(service);
-		
-		IDSProvide[] providedServices = service.getProvidedServices();
-		assertTrue(providedServices.length==1);
-		
-		//Removing Provided Service
-		service.removeProvidedService(providedServices[0]);
-		
-		service = component.getService();
-		assertNotNull(service);
-		
-		assertTrue(service.getProvidedServices().length == 0);
-
-	}
-	
-	/**
-	 * Tests to add a service by DSDocumentFactory
-	 */
-	public void testAddServiceFactory(){
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer , LF);
-		load();
-		
-		IDSDocumentFactory factory = fModel.getFactory();
-		IDSService service = factory.createService();
-		service.setServiceFactory(true);
-		
-		IDSComponent component = fModel.getDSComponent();
-		component.setService(service);
-		
-		String content = component.toString();
-		
-		assertTrue(content.indexOf("servicefactory=\"true\"") != -1);
-		
-		IDSService service0 = component.getService();
-		assertNotNull(service0);
-		assertTrue(service0.getServiceFactory());
-		
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java
deleted file mode 100644
index 291c6aa..0000000
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSv10tov11TestCase.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *     IBM Corporation - continued improvements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.tests;
-
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-
-public class DSv10tov11TestCase extends AbstractDSModelTestCase {
-	
-	public void testAddDefaultComponent() {
-		StringBuffer buffer = new StringBuffer();
-		setXMLContents(buffer, LF);
-		load();
-
-		IDSComponent component = fModel.getDSComponent();
-		assertNotNull(component);
-		
-		assertEquals(component.getName(), COMPONENT_NAME);
-		assertEquals(component.getNamespace(), "http://www.osgi.org/xmlns/scr/v1.1.0");
-	}
-	
-	protected void setXMLContents(StringBuffer body, String newline) {
-		StringBuffer sb = new StringBuffer();
-		sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		sb.append(newline);
-		sb.append("<component name=\"" + COMPONENT_NAME + "\">");
-		sb.append(newline);
-		if (body != null)
-			sb.append(body.toString());
-		sb.append(newline);
-		sb.append("</component>");
-		sb.append(newline);
-		fDocument.set(sb.toString());
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.tests/test.xml b/ds/org.eclipse.pde.ds.tests/test.xml
deleted file mode 100755
index a32df8d..0000000
--- a/ds/org.eclipse.pde.ds.tests/test.xml
+++ /dev/null

@@ -1,57 +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.ds.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.internal.ds.tests.AllDSModelTests"/>
-    </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">
-	</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">
-	</target>
-
-</project>

diff --git a/ds/org.eclipse.pde.ds.ui/.classpath b/ds/org.eclipse.pde.ds.ui/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/ds/org.eclipse.pde.ds.ui/.classpath
+++ /dev/null

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

diff --git a/ds/org.eclipse.pde.ds.ui/.cvsignore b/ds/org.eclipse.pde.ds.ui/.cvsignore
deleted file mode 100644
index 3aef9b8..0000000
--- a/ds/org.eclipse.pde.ds.ui/.cvsignore
+++ /dev/null

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

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.ds.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.core.prefs b/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0f49dfe..0000000
--- a/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,74 +0,0 @@
-#Thu Mar 19 11:34:55 CDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-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.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-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.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-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.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3

diff --git a/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.ui.prefs b/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index e8c1a7d..0000000
--- a/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,107 +0,0 @@
-#Tue Apr 15 11:59:06 CDT 2008
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=true
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.pde.prefs b/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 59eb154..0000000
--- a/ds/org.eclipse.pde.ds.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,18 +0,0 @@
-#Mon Mar 31 08:51:42 CDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-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/ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index eb6f21d..0000000
--- a/ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde.ds.ui;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.pde.internal.ds.ui.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.ds.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.pde.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.text;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.pde.internal.ds.ui;x-internal:=true,
- org.eclipse.pde.internal.ds.ui.editor;x-internal:=true,
- org.eclipse.pde.internal.ds.ui.editor.contentassist;x-internal:=true,
- org.eclipse.pde.internal.ds.ui.editor.dialogs;x-internal:=true,
- org.eclipse.pde.internal.ds.ui.editor.sections;x-internal:=true,
- org.eclipse.pde.internal.ds.ui.parts;x-internal:=true,
- org.eclipse.pde.internal.ds.ui.wizards;x-internal:=true
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName

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

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

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

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               about.html
-src.includes = about.html

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

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

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.gif
deleted file mode 100644
index 769cefc..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.gif
+++ /dev/null
Binary files differ

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

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.gif
deleted file mode 100644
index 24490b1..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.gif
deleted file mode 100644
index 4b52f6d..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.gif
+++ /dev/null
Binary files differ

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

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

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.gif
deleted file mode 100644
index 8c35203..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.gif
deleted file mode 100644
index 6223cfc..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.gif
deleted file mode 100644
index 20f209a..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.gif
deleted file mode 100644
index 3c1fa1f..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.gif
+++ /dev/null
Binary files differ

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

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

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

diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.gif b/ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.gif
deleted file mode 100644
index 523ab3b..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.gif b/ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.gif
deleted file mode 100644
index dec0dc4..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.gif
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.png b/ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.png
deleted file mode 100755
index 1d1ef9b..0000000
--- a/ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.png
+++ /dev/null
Binary files differ

diff --git a/ds/org.eclipse.pde.ds.ui/plugin.properties b/ds/org.eclipse.pde.ds.ui/plugin.properties
deleted file mode 100644
index db1c02f..0000000
--- a/ds/org.eclipse.pde.ds.ui/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#Properties file for org.eclipse.pde.ds.ui
-pluginName = PDE DS UI
-providerName = Eclipse.org
-editors.ds.name = Component Definition Editor
-wizard.name = Component Definition
-new.wizard.description = Create a Component definition
\ No newline at end of file

diff --git a/ds/org.eclipse.pde.ds.ui/plugin.xml b/ds/org.eclipse.pde.ds.ui/plugin.xml
deleted file mode 100644
index 45a4c3b..0000000
--- a/ds/org.eclipse.pde.ds.ui/plugin.xml
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!--
-    Copyright (c) 2008 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.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>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            class="org.eclipse.pde.internal.ds.ui.editor.DSEditor"
-            contributorClass="org.eclipse.pde.internal.ds.ui.editor.DSEditorContributor"
-            default="true"
-            icon="$nl$/icons/obj16/ds_obj.gif"
-            id="org.eclipse.pde.ds.ui.editor"
-            name="%editors.ds.name">
-         <contentTypeBinding
-               contentTypeId="org.eclipse.pde.ds.core.content-type">
-         </contentTypeBinding>
-      </editor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            category="org.eclipse.pde.PDE"
-            class="org.eclipse.pde.internal.ds.ui.wizards.DSNewWizard"
-            icon="$nl$/icons/obj16/ds_wizard_obj.gif"
-            id="org.eclipse.pde.ds.ui.wizard"
-            name="%wizard.name">
-         <description>
-            %new.wizard.description
-         </description>
-      </wizard>
-   </extension>
-   
-   <extension point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension targetID="org.eclipse.pde.ui.PDEPerspective">
-         <newWizardShortcut id="org.eclipse.pde.ds.ui.wizard"/>
-      </perspectiveExtension>
-   </extension> 
-</plugin>

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Activator.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Activator.java
deleted file mode 100644
index b13b2b8..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Activator.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.pde.ds.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-	
-	protected void initializeImageRegistry(ImageRegistry registry) {
-		registry.put(SharedImages.DESC_IMPLEMENTATION,
-				createImageDescriptor(SharedImages.DESC_IMPLEMENTATION));
-		registry.put(SharedImages.DESC_PROPERTIES,
-				createImageDescriptor(SharedImages.DESC_PROPERTIES));
-		registry.put(SharedImages.DESC_PROPERTY,
-				createImageDescriptor(SharedImages.DESC_PROPERTY));
-		registry.put(SharedImages.DESC_PROVIDE,
-				createImageDescriptor(SharedImages.DESC_PROVIDE));
-		registry.put(SharedImages.DESC_REFERENCE,
-				createImageDescriptor(SharedImages.DESC_REFERENCE));
-		registry.put(SharedImages.DESC_REFERENCE_ZERO_N,
-				createImageDescriptor(SharedImages.DESC_REFERENCE_ZERO_N));
-		registry.put(SharedImages.DESC_REFERENCE_ZERO_ONE,
-				createImageDescriptor(SharedImages.DESC_REFERENCE_ZERO_ONE));
-		registry.put(SharedImages.DESC_REFERENCE_ONE_N,
-				createImageDescriptor(SharedImages.DESC_REFERENCE_ONE_N));
-		registry.put(SharedImages.DESC_ROOT,
-				createImageDescriptor(SharedImages.DESC_ROOT));
-		registry.put(SharedImages.DESC_SERVICE,
-				createImageDescriptor(SharedImages.DESC_SERVICE));
-		registry.put(SharedImages.DESC_SERVICES,
-				createImageDescriptor(SharedImages.DESC_SERVICES));
-		registry.put(SharedImages.DESC_DS,
-				createImageDescriptor(SharedImages.DESC_DS));
-		registry.put(SharedImages.DESC_ATTR,
-				createImageDescriptor(SharedImages.DESC_ATTR));
-		registry.put(SharedImages.OVR_DYNAMIC,
-				createImageDescriptor(SharedImages.OVR_DYNAMIC));
-		registry.put(SharedImages.DESC_DETAILS,
-				createImageDescriptor(SharedImages.DESC_DETAILS));
-		registry.put(SharedImages.DESC_DS_WIZ,
-				createImageDescriptor(SharedImages.DESC_DS_WIZ));
-	}
-	
-	private ImageDescriptor createImageDescriptor(String id) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, id);
-	}
-	
-	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 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, PLUGIN_ID, IStatus.OK,
-					message, e);
-		}
-		ResourcesPlugin.getPlugin().getLog().log(status);
-		Display display = Display.getCurrent() == null ? Display.getCurrent()
-				: Display.getDefault();
-		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);
-	}
-
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/IConstants.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/IConstants.java
deleted file mode 100644
index 5d5f893..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/IConstants.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui;
-
-public interface IConstants {
-	
-	public static final String ID_EDITOR = "org.eclipse.pde.ui.dsEditor"; //$NON-NLS-1$
-	public static final String ID_BUILDER = "org.eclipse.pde.ds.core.builder"; //$NON-NLS-1$
-	
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Messages.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Messages.java
deleted file mode 100644
index 588295a..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/Messages.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 223738
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	public static String DSAddItemAction_addProperties;
-	public static String DSAddItemAction_addProperty;
-	public static String DSAddItemAction_addProvidedService;
-	public static String DSAddItemAction_addReferencedService;
-	public static String DSAddItemAction_addService;
-
-	public static String DSComponentDetails_mainSectionTitle;
-	public static String DSComponentDetails_mainSectionDescription;
-	public static String DSComponentDetails_nameEntry;
-	public static String DSComponentDetails_activateEntry;
-	public static String DSComponentDetails_activateTooltip;
-	public static String DSComponentDetails_deactivateEntry;
-	public static String DSComponentDetails_deactivateTooltip;
-	public static String DSComponentDetails_modifiedEntry;
-	public static String DSComponentDetails_modifiedTooltip;
-	public static String DSComponentDetails_factoryEntry;
-	public static String DSComponentDetails_configurationPolicy;
-	public static String DSComponentDetails_enabledLabel;
-	public static String DSComponentDetails_immediateLabel;
-	public static String DSComponentDetails_browse;
-	
-	public static String DSCreationOperation_title;
-
-	public static String DSFileWizardPage_description;
-	public static String DSFileWizardPage_title;
-	public static String DSFileWizardPage_group;
-	public static String DSFileWizardPage_component_name;
-	public static String DSFileWizardPage_implementation_class;
-	public static String DSFileWizardPage_browse;
-	public static String DSFileWizardPage_selectType;
-	public static String DSFileWizardPage_not_OSGI_folder;
-	
-	public static String DSNewWizard_title;
-	
-	public static String DSImplementationDetails_title;
-	public static String DSImplementationDetails_description;
-	public static String DSImplementationDetails_classEntry;
-	public static String DSImplementationDetails_browse;
-	public static String DSImplementationDetails_selectType;
-
-	public static String DSPage_errorTitle;
-	public static String DSPage_errorMessage;
-	public static String DSPage_formTitle;
-
-	public static String DSPage_title;
-	public static String DSPluginTemplateWizard_title;
-
-	public static String DSPropertiesDetails_sectionTitle;
-	public static String DSPropertiesDetails_sectionDescription;
-	public static String DSPropertiesDetails_entry;
-	public static String DSPropertiesDetails_browse;
-	public static String DSPropertiesDetails_dialogTitle;
-	public static String DSPropertiesDetails_dialogMessage;
-
-	public static String DSPropertyDetails_mainSectionText;
-	public static String DSPropertyDetails_mainSectionDescription;
-	public static String DSPropertyDetails_nameEntry;
-	public static String DSPropertyDetails_valueEntry;
-	public static String DSPropertyDetails_typeEntry;
-	public static String DSPropertyDetails_bodyLabel;
-
-	public static String DSProvideDetails_mainSectionText;
-	public static String DSProvideDetails_mainSectionDesc;
-	public static String DSProvideDetails_interface;
-	public static String DSProvideDetails_browse;
-	public static String DSProvideDetails_selectType;
-
-	public static String DSServiceDetails_sectionTitle;
-	public static String DSServiceDetails_sectionDescription;
-	public static String DSServiceDetails_serviceFactoryLabel;
-
-	public static String DSSourcePage_partName;
-
-	public static String DSMasterTreeSection_addService;
-	public static String DSMasterTreeSection_addProperty;
-	public static String DSMasterTreeSection_addProperties;
-	public static String DSMasterTreeSection_addReference;
-	public static String DSMasterTreeSection_addProvide;
-
-	public static String DSMasterTreeSection_up;
-	public static String DSMasterTreeSection_down;
-	public static String DSMasterTreeSection_remove;
-	public static String DSMasterTreeSection_client_text;
-	public static String DSMasterTreeSection_client_description;
-
-	public static String DSReferenceDetails_title;
-	public static String DSReferenceDetails_description;
-	public static String DSReferenceDetails_bindEntry;
-	public static String DSReferenceDetails_unbindEntry;
-	public static String DSReferenceDetails_policeLabel;
-	public static String DSReferenceDetails_nameEntry;
-	public static String DSReferenceDetails_interfaceEntry;
-	public static String DSReferenceDetails_cardinalityLabel;
-	public static String DSReferenceDetails_targetEntry;
-	public static String DSReferenceDetails_browse;
-	public static String DSReferenceDetails_selectType;
-
-	public static String DSRemoveItemAction_actionText;
-	
-	public static String DSSimpPage_title;
-	
-	public static String DSServicesPage_title;
-
-	public static String DSSection_title;
-	public static String DSSection_description;
-	
-	public static String DSOptionsSection_title;
-	public static String DSOptionsSection_description;
-
-	public static String DSReferenceSection_title;
-	public static String DSReferenceSection_description;
-	public static String DSReferenceSection_add;
-	public static String DSReferenceSection_remove;
-	public static String DSReferenceSection_edit;
-	public static String DSReferenceSection_up;
-	public static String DSReferenceSection_down;
-	
-	public static String DSProvideSection_title;
-	public static String DSProvideSection_description;
-	public static String DSProvideSection_add;
-	public static String DSProvideSection_remove;
-	public static String DSProvideSection_edit;
-	public static String DSProvideSection_ServiceFactoryButtonMessage;
-	
-	public static String DSEditReferenceDialog_OK;
-	public static String DSEditReferenceDialog_Cancel;
-	public static String DSEditReferenceDialog_dialog_title;
-	public static String DSEditReferenceDialog_dialogMessage;
-
-	public static String DSEditProvideDialog_OK;
-	public static String DSEditProvideDialog_Cancel;
-	public static String DSEditProvideDialog_dialog_title;
-	public static String DSEditProvideDialog_dialogMessage;
-	
-	public static String DSPropertiesSection_title;
-	public static String DSPropertiesSection_description;
-	public static String DSPropertiesSection_addProperties;
-	public static String DSPropertiesSection_addProperty;
-	public static String DSPropertiesSection_remove;
-	public static String DSPropertiesSection_edit;
-	public static String DSPropertiesSection_up;
-	public static String DSPropertiesSection_down;
-
-	public static String DSEditPropertiesDialog_OK;
-	public static String DSEditPropertiesDialog_Cancel;
-	public static String DSEditPropertiesDialog_dialog_title;
-	public static String DSEditPropertiesDialog_dialogMessage;
-	
-	public static String DSEditPropertyDialog_dialog_title;
-	public static String DSEditPropertyDialog_dialogMessage;
-	public static String DSEditPropertyDialog_valuesLabel;
-	
-	public static String DSServiceComponentSection_immediateButtonMessage;
-	public static String DSServiceComponentSection_enabledButtonMessage;
-	
-	public static String DSService_title;
-
-	
-	
-
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ds.ui.messages"; //$NON-NLS-1$
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SWTUtil.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SWTUtil.java
deleted file mode 100644
index b434801..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SWTUtil.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.layout.PixelConverter;
-import org.eclipse.jface.resource.JFaceResources;
-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;
-
-/**
- * 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/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SharedImages.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SharedImages.java
deleted file mode 100644
index 0fb42c9..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/SharedImages.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DecorationOverlayIcon;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.swt.graphics.Image;
-
-public final class SharedImages {
-
-	private SharedImages() { // do nothing
-	}
-
-	public final static int F_DYNAMIC = 1;
-
-	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_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$
-	private static final String PATH_WIZBAN = ICONS_PATH + "wizban/"; //$NON-NLS-1$
-
-	public static final String DESC_IMPLEMENTATION = PATH_OBJ + "class_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_PROPERTY = PATH_OBJ + "property_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_PROPERTIES = PATH_OBJ
-			+ "properties_obj.gif"; //$NON-NLS-1$	
-	public static final String DESC_PROVIDE = PATH_OBJ + "int_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_REFERENCE = PATH_OBJ + "reference_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_REFERENCE_ONE_N = PATH_OBJ
-			+ "reference_one_n_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_REFERENCE_ZERO_ONE = PATH_OBJ
-			+ "reference_zero_one_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_REFERENCE_ZERO_N = PATH_OBJ
-			+ "reference_zero_n_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_ROOT = PATH_OBJ + "component_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_SERVICE = PATH_OBJ + "service_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_SERVICES = PATH_OBJ + "services_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_DS = PATH_OBJ + "ds_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_ATTR = PATH_OBJ + "attribute_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_DETAILS = PATH_OBJ + "details_obj.gif"; //$NON-NLS-1$
-
-	public static final String OVR_DYNAMIC = PATH_OVR + "synch_co.gif"; //$NON-NLS-1$
-
-	public static final String DESC_DS_WIZ = PATH_WIZBAN + "defcon_wiz.png"; //$NON-NLS-1$
-
-	public static ImageDescriptor getImageDescriptor(String key) {
-		return Activator.getDefault().getImageRegistry().getDescriptor(key);
-	}
-
-	public static Image getImage(String key) {
-		return Activator.getDefault().getImageRegistry().get(key);
-	}
-
-	public static Image getImage(String key, int flags) {
-		// TODO crufty code
-		Image image = Activator.getDefault().getImageRegistry().get(key);
-		if ((flags & F_DYNAMIC) != 0) {
-			Image o = Activator.getDefault().getImageRegistry().get(
-					key + OVR_DYNAMIC);
-			if (o != null)
-				return o;
-			Image i = new DecorationOverlayIcon(image, SharedImages
-					.getImageDescriptor(OVR_DYNAMIC),
- IDecoration.TOP_RIGHT)
-					.createImage();
-			Activator.getDefault().getImageRegistry().put(key + OVR_DYNAMIC, i);
-			return i;
-		}
-		return image;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSContentProvider.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSContentProvider.java
deleted file mode 100644
index dce9529..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSContentProvider.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-
-public class DSContentProvider implements IContentProvider,
-		ITreeContentProvider {
-
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof IDSModel) {
-			return new Object[] { ((IDSModel) parentElement).getDSComponent() };
-		} else if (parentElement instanceof IDSObject) {
-			List list = ((IDSObject) parentElement).getChildNodesList();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-		return new Object[0];
-	}
-
-	public Object getParent(Object element) {
-		if (element instanceof IDSObject) {
-			return ((IDSObject) element).getParentNode();
-		}
-		return null;
-	}
-
-	public boolean hasChildren(Object element) {
-		return (getChildren(element).length > 0);
-	}
-
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	public void dispose() {
-
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditor.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditor.java
deleted file mode 100644
index 8087ec3..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditor.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.IConstants;
-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.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;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-
-public class DSEditor extends MultiSourceEditor {
-
-	public DSEditor() {
-		super();
-	}
-
-	protected void addEditorPages() {
-		try {
-			addPage(new DSOverviewPage(this));
-			addPage(new DSServicesPage(this));
-		} catch (PartInitException e) {
-			Activator.logException(e);
-		}
-		// Add source page
-		addSourcePage(DSInputContext.CONTEXT_ID);
-
-	}
-	
-	public void contributeToToolbar(IToolBarManager manager) {
-		// TODO add help icon here maybe?
-	}
-
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new DSFormOutlinePage(this);
-	}
-
-	protected InputContextManager createInputContextManager() {
-		return new DSInputContextManager(this);
-		}
-
-	protected void createResourceContexts(InputContextManager contexts,
-			IFileEditorInput input) {
-		contexts.putContext(input, new DSInputContext(this, input, true));
-		contexts.monitorFile(input.getFile());
-	}
-
-	protected void createStorageContexts(InputContextManager contexts,
-			IStorageEditorInput input) {
-		contexts.putContext(input, new DSInputContext(this, input, true));
-	}
-
-	protected void createSystemFileContexts(InputContextManager contexts,
-			FileStoreEditorInput input) {
-		try {
-			IFileStore store = EFS.getStore(input.getURI());
-			IEditorInput in = new FileStoreEditorInput(store);
-			contexts.putContext(in, new DSInputContext(this, in, true));
-		} catch (CoreException e) {
-			Activator.logException(e);
-		}
-	}
-
-	private void addDSBuilder(IFile file) {
-		try {
-			// Add builder
-			IProject project = file.getProject();
-			IProjectDescription description = project.getDescription();
-			ICommand[] commands = description.getBuildSpec();
-
-			for (int i = 0; i < commands.length; ++i) {
-				if (commands[i].getBuilderName().equals(IConstants.ID_BUILDER)) {
-					return;
-				}
-			}
-
-			ICommand[] newCommands = new ICommand[commands.length + 1];
-			System.arraycopy(commands, 0, newCommands, 0, commands.length);
-			ICommand command = description.newCommand();
-			command.setBuilderName(IConstants.ID_BUILDER);
-			newCommands[newCommands.length - 1] = command;
-			description.setBuildSpec(newCommands);
-			project.setDescription(description, null);
-
-		} catch (CoreException e) {
-			Activator.logException(e, null, null);
-		}
-		
-	}
-
-	public void editorContextAdded(InputContext context) {
-		addSourcePage(context.getId());
-	}
-
-	protected String getEditorID() {
-		return IConstants.ID_EDITOR;
-	}
-
-	protected InputContext getInputContext(Object object) {
-		return fInputContextManager.findContext(DSInputContext.CONTEXT_ID);
-	}
-
-	public void contextRemoved(InputContext context) {
-		close(false);
-	}
-
-	public void monitoredFileAdded(IFile monitoredFile) {
-		// no op
-	}
-
-	public boolean monitoredFileRemoved(IFile monitoredFile) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-	
-	public void doSave(IProgressMonitor monitor) {
-		IEditorInput input = getEditorInput();
-		if (input instanceof IFileEditorInput) {
-			IFileEditorInput fileInput = (IFileEditorInput) input;
-			addDSBuilder((IFile) fileInput.getFile());
-		}
-		super.doSave(monitor);
-	}
-
-	protected PDESourcePage createSourcePage(PDEFormEditor editor,
-			String title, String name, String contextId) {
-		return new DSSourcePage(editor, title, name);
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditorContributor.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditorContributor.java
deleted file mode 100644
index f33a1a3..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSEditorContributor.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.pde.internal.ui.editor.PDEFormTextEditorContributor;
-
-public class DSEditorContributor extends PDEFormTextEditorContributor {
-
-	public DSEditorContributor() {
-		super("DS Editor"); //$NON-NLS-1$
-	}
-
-	public boolean supportsHyperlinking() {
-		return true;
-	}
-	
-	public boolean supportsContentAssist() {
-		return true;
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSFormOutlinePage.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSFormOutlinePage.java
deleted file mode 100644
index b22fb28..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSFormOutlinePage.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 223739
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-
-public class DSFormOutlinePage extends FormOutlinePage  {
-
-	public DSFormOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#createLabelProvider()
-	 */
-	public ILabelProvider createLabelProvider() {
-		return new DSLabelProvider();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getParentPageId(java.lang.Object)
-	 */
-	protected String getParentPageId(Object item) {
-		return DSOverviewPage.PAGE_ID;
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSHyperlinkDetector.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSHyperlinkDetector.java
deleted file mode 100644
index d8761b5..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSHyperlinkDetector.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ui.editor.PDEHyperlinkDetector;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.text.JavaHyperlink;
-import org.eclipse.pde.internal.ui.editor.text.ResourceHyperlink;
-
-public class DSHyperlinkDetector extends PDEHyperlinkDetector {
-
-	/**
-	 * @param editor
-	 *            the editor in which to detect the hyperlink
-	 */
-	public DSHyperlinkDetector(PDESourcePage page) {
-		super(page);
-	}
-
-	protected IHyperlink[] detectAttributeHyperlink(IDocumentAttributeNode attr) {
-		String attrValue = attr.getAttributeValue();
-		if (attrValue.length() == 0)
-			return null;
-
-		if (!(attr.getEnclosingElement() instanceof IDSObject)) {
-			return null;
-		}
-		IDSObject node = (IDSObject) attr.getEnclosingElement();
-
-		if (node == null || !node.getModel().isEditable())
-			return null;
-
-		IRegion linkRegion = new Region(attr.getValueOffset(), attr
-				.getValueLength());
-
-		IHyperlink[] link = new IHyperlink[1];
-		IDSModel base = node.getModel();
-		IResource res = base.getUnderlyingResource();
-
-		// Java HyperLink
-		if (node instanceof IDSImplementation) {
-			link[0] = new JavaHyperlink(linkRegion, attrValue, res);
-		} else if (node instanceof IDSComponent) {
-			if (attr.getAttributeName().equals(IDSConstants.ATTRIBUTE_COMPONENT_FACTORY)) {
-				link[0] = new JavaHyperlink(linkRegion, attrValue, res);
-			}
-		} else if (node instanceof IDSReference) {
-			if (attr.getAttributeName().equals(
-					IDSConstants.ATTRIBUTE_REFERENCE_INTERFACE)) {
-				link[0] = new JavaHyperlink(linkRegion, attrValue, res);
-			}
-		} else if (node instanceof IDSProperty) {
-			if (attr.getAttributeName().equals(
-					IDSConstants.ATTRIBUTE_PROPERTY_TYPE)) {
-				link[0] = new JavaHyperlink(linkRegion, attrValue, res);
-			}
-		} else if (node instanceof IDSProvide) {
-			if (attr.getAttributeName().equals(
-					IDSConstants.ATTRIBUTE_PROVIDE_INTERFACE)) {
-				link[0] = new JavaHyperlink(linkRegion, attrValue, res);
-			}
-
-			// Resource Hyperlink
-		} else if (node instanceof IDSProperties) {
-			if (attr.getAttributeName().equals(IDSConstants.ATTRIBUTE_PROPERTIES_ENTRY)) {
-				link[0] = new ResourceHyperlink(linkRegion, attrValue, res);
-			}
-
-			// TODO reference bind and reference unbind should link to methods
-			// declarations?
-		}
-
-		if (link[0] != null)
-			return link;
-
-		return null;
-	}
-
-	protected IHyperlink[] detectNodeHyperlink(IDocumentElementNode node) {
-		return null;
-	}
-
-	protected IHyperlink[] detectTextNodeHyperlink(IDocumentTextNode node) {
-		return null;
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContext.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContext.java
deleted file mode 100644
index 6aad5fa..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContext.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-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.internal.ds.core.text.DSModel;
-import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput;
-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;
-import org.eclipse.ui.IURIEditorInput;
-
-/**
- * DSInputContext
- */
-public class DSInputContext extends XMLInputContext {
-
-	public static final String CONTEXT_ID = "ds-context"; //$NON-NLS-1$	
-
-	/**
-	 * @param editor
-	 * @param input
-	 * @param primary
-	 */
-	public DSInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-
-	protected void reorderInsertEdits(ArrayList ops) {
-		// no op
-		
-	}
-
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		if (input instanceof IStorageEditorInput) {
-			boolean isReconciling = input instanceof IFileEditorInput;
-			IDocument document = getDocumentProvider().getDocument(input);
-
-			DSModel model = new DSModel(document, isReconciling);
-
-			if (input instanceof IFileEditorInput) {
-				IFile file = ((IFileEditorInput) input).getFile();
-				model.setUnderlyingResource(file);
-				model.setCharset(file.getCharset());
-			} else if (input instanceof IURIEditorInput) {
-				IFileStore store = EFS.getStore(((IURIEditorInput) input)
-						.getURI());
-				model.setInstallLocation(store.getParent().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;
-		}
-
-		return null;
-	}
-
-	public String getId() {
-		return CONTEXT_ID;
-	}
-
-	protected String getPartitionName() {
-		return "___ds_partition"; //$NON-NLS-1$
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContextManager.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContextManager.java
deleted file mode 100644
index 8bce7e5..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSInputContextManager.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-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 DSInputContextManager extends InputContextManager {
-
-	public DSInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContextManager#getAggregateModel()
-	 */
-	public IBaseModel getAggregateModel() {
-		InputContext context = findContext(DSInputContext.CONTEXT_ID);
-		return (context != null) ? context.getModel() : null;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSLabelProvider.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSLabelProvider.java
deleted file mode 100644
index 83ae4b1..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSLabelProvider.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028, 248197
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SharedImages;
-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;
-
-public class DSLabelProvider extends LabelProvider {
-
-	public String getText(Object obj) {
-
-		if (obj instanceof IDSObject) {
-			return getObjectText((IDSObject) obj);
-		}
-
-		if (obj instanceof IFormPage)
-			return ((IFormPage) obj).getTitle();
-
-		return super.getText(obj);
-	}
-
-	public String getObjectText(IDSObject obj) {
-		if (obj.getType() == IDSConstants.TYPE_SERVICE) {
-			return Messages.DSService_title;
-		}
-		// if we're a reference and have no name, return the interface
-		if (obj.getType() == IDSConstants.TYPE_REFERENCE) {
-			IDSReference reference = (IDSReference) obj;
-			if (reference.getName() == null
-					|| reference.getName().length() == 0)
-				return reference.getReferenceInterface();
-		}
-		return obj.getName();
-	}
-
-	public Image getImage(Object obj) {
-		if (obj instanceof IDSObject) {
-			return getObjectImage((IDSObject) obj);
-		}
-
-		// TODO consider changing this
-		if (obj instanceof IFormPage)
-			return PDEPlugin.getDefault().getLabelProvider().get(
-					PDEPluginImages.DESC_PAGE_OBJ);
-
-		return super.getImage(obj);
-	}
-
-	private Image getObjectImage(IDSObject obj) {
-		if (obj.getType() == IDSConstants.TYPE_IMPLEMENTATION) {
-			return SharedImages.getImage(SharedImages.DESC_IMPLEMENTATION);
-		} else if (obj.getType() == IDSConstants.TYPE_PROPERTIES) {
-			return SharedImages.getImage(SharedImages.DESC_PROPERTIES);
-		} else if (obj.getType() == IDSConstants.TYPE_PROPERTY) {
-			return SharedImages.getImage(SharedImages.DESC_PROPERTY);
-		} else if (obj.getType() == IDSConstants.TYPE_PROVIDE) {
-			return SharedImages.getImage(SharedImages.DESC_SERVICE);
-		} else if (obj.getType() == IDSConstants.TYPE_REFERENCE) {
-			IDSReference reference = (IDSReference) obj;
-			int flags = 0;
-			
-			if (reference == null || reference.getReferencePolicy() == null
-					|| reference.getReferenceCardinality() == null)
-				return SharedImages
-						.getImage(SharedImages.DESC_REFERENCE, flags); 
-				
-			if (reference.getReferencePolicy().equals(
-					IDSConstants.VALUE_REFERENCE_POLICY_DYNAMIC)) {
-				flags |= SharedImages.F_DYNAMIC;
-			}
-			String cardinality = reference.getReferenceCardinality();
-			if (cardinality.equals(
-					IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_ONE)) {
-				return SharedImages.getImage(
-						SharedImages.DESC_REFERENCE_ZERO_ONE, flags);
-			} else if (cardinality.equals(
-					IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_N)) {
-				return SharedImages.getImage(
-						SharedImages.DESC_REFERENCE_ZERO_N, flags);
-			} else if (cardinality.equals(
-					IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_N)) {
-				return SharedImages.getImage(SharedImages.DESC_REFERENCE_ONE_N,
-						flags);
-			}
-			return SharedImages.getImage(SharedImages.DESC_REFERENCE, flags);
-		} else if (obj.getType() == IDSConstants.TYPE_COMPONENT) {
-			return SharedImages.getImage(SharedImages.DESC_ROOT);
-		} else if (obj.getType() == IDSConstants.TYPE_SERVICE) {
-			return SharedImages.getImage(SharedImages.DESC_SERVICES);
-		}
-		return null;
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSOverviewPage.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSOverviewPage.java
deleted file mode 100644
index a53a6db..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSOverviewPage.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SharedImages;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSComponentSection;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSOptionsSection;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSPropertiesSection;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-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 DSOverviewPage extends PDEFormPage implements
-		IModelChangedListener {
-
-	public static final String PAGE_ID = "overview"; //$NON-NLS-1$
-
-	public DSOverviewPage(FormEditor editor) {
-		super(editor, PAGE_ID, Messages.DSSimpPage_title);
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		// no op
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setImage(SharedImages.getImage(SharedImages.DESC_DS));
-		form.setText(Messages.DSSimpPage_title);
-		fillBody(managedForm, toolkit);
-
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody()C,
-		// IHelpContextIds.TOC_EDITOR);
-	}
-
-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
-		Composite body = managedForm.getForm().getBody();
-		body.setLayout(FormLayoutFactory.createFormGridLayout(true, 4));
-		
-		Composite topLeft = toolkit.createComposite(body);
-		topLeft.setLayout(GridLayoutFactory.fillDefaults().create());
-		topLeft.setLayoutData(GridDataFactory.fillDefaults().grab(true, false)
-				.span(2, 1).create());
-
-		Composite topRight = toolkit.createComposite(body);
-		topRight.setLayout(GridLayoutFactory.fillDefaults().create());
-		topRight.setLayoutData(GridDataFactory.fillDefaults().grab(true, false)
-				.span(2, 1).create());
-		
-		Composite bottom = toolkit.createComposite(body);
-		bottom.setLayout(new GridLayout());
-		bottom.setLayoutData(GridDataFactory.fillDefaults().grab(true, false)
-				.span(4, 1).create());
-
-		// Sections
-		managedForm.addPart(new DSComponentSection(this, topLeft));
-		managedForm.addPart(new DSOptionsSection(this, topRight));
-		managedForm.addPart(new DSPropertiesSection(this, bottom));
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSServicesPage.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSServicesPage.java
deleted file mode 100644
index d5cde8a..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSServicesPage.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SharedImages;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSProvideSection;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSReferenceSection;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-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 DSServicesPage extends PDEFormPage implements
-		IModelChangedListener {
-
-	public static final String PAGE_ID = "services"; //$NON-NLS-1$
-
-	public DSServicesPage(FormEditor editor) {
-		super(editor, PAGE_ID, Messages.DSServicesPage_title);
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		// no op
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setImage(SharedImages.getImage(SharedImages.DESC_DS));
-		form.setText(Messages.DSServicesPage_title);
-		fillBody(managedForm, toolkit);
-
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody()C,
-		// IHelpContextIds.TOC_EDITOR);
-	}
-
-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
-		Composite body = managedForm.getForm().getBody();
-		body.setLayout(FormLayoutFactory.createFormGridLayout(true, 1));
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.grabExcessVerticalSpace = true;
-		body.setLayoutData(data);
-		
-		// Sections
-		managedForm.addPart(new DSReferenceSection(this, body));
-		managedForm.addPart(new DSProvideSection(this, body));
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourcePage.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourcePage.java
deleted file mode 100644
index 2ae5fa9..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourcePage.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 262622
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.ds.core.text.DSModel;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.XMLSourcePage;
-import org.eclipse.pde.internal.ui.editor.text.ChangeAwareSourceViewerConfiguration;
-import org.eclipse.pde.internal.ui.editor.text.IColorManager;
-
-public class DSSourcePage extends XMLSourcePage {
-
-
-	public DSSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	public boolean isQuickOutlineEnabled() {
-		return true;
-	}
-
-	public ViewerComparator createOutlineComparator() {
-		return null;
-	}
-
-	public ITreeContentProvider createOutlineContentProvider() {
-		return new DSContentProvider();
-	}
-
-	public ILabelProvider createOutlineLabelProvider() {
-		return new DSLabelProvider();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#updateSelection(java.lang.Object)
-	 */
-	public void updateSelection(Object object) {
-		if ((object instanceof IDocumentElementNode)
-				&& (((IDocumentElementNode) object).isErrorNode() == false)) {
-			setSelectedObject(object);
-			setHighlightRange((IDocumentElementNode) object, true);
-			setSelectedRange((IDocumentElementNode) object, false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#findRange()
-	 */
-	protected IDocumentRange findRange() {
-
-		Object selectedObject = getSelection();
-
-		if (selectedObject instanceof IDocumentElementNode) {
-			return (IDocumentElementNode) selectedObject;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#getRangeElement(int,
-	 *      boolean)
-	 */
-	public IDocumentRange getRangeElement(int offset, boolean searchChildren) {
-		IDocumentElementNode rootNode = ((DSModel) getInputContext().getModel())
-				.getDSComponent();
-		return findNode(rootNode, offset, searchChildren);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#synchronizeOutlinePage(int)
-	 */
-	protected void synchronizeOutlinePage(int offset) {
-		IDocumentRange range = getRangeElement(offset, true);
-		updateHighlightRange(range);
-		range = adaptRange(range);
-		updateOutlinePageSelection(range);
-	}
-
-	/**
-	 * @param range
-	 */
-	public IDocumentRange adaptRange(IDocumentRange range) {
-		// Adapt the range to node that is viewable in the outline view
-		if (range instanceof IDocumentAttributeNode) {
-			// Attribute
-			return adaptRange(((IDocumentAttributeNode) range)
-					.getEnclosingElement());
-		} else if (range instanceof IDocumentTextNode) {
-			// Content
-			return adaptRange(((IDocumentTextNode) range).getEnclosingElement());
-		} else if (range instanceof IDocumentElementNode) {
-			// Element
-			return range;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.EditorPart#setPartName(java.lang.String)
-	 */
-	protected void setPartName(String partName) {
-		super.setPartName(Messages.DSSourcePage_partName); //$NON-NLS-1$
-	}
-
-
-	public Object getAdapter(Class adapter) {
-		if (IHyperlinkDetector.class.equals(adapter))
-			return new DSHyperlinkDetector(this);
-		return super.getAdapter(adapter);
-	}
-
-	public void setActive(boolean active) {
-		super.setActive(active);
-		// Update the text selection if this page is being activated
-		if (active) {
-			updateTextSelection();
-		}
-	}
-
-	protected ChangeAwareSourceViewerConfiguration createSourceViewerConfiguration(
-			IColorManager colorManager) {
-		return new DSSourceViewerConfiguration(colorManager, this);
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourceViewerConfiguration.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourceViewerConfiguration.java
deleted file mode 100644
index 2ff04e8..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSSourceViewerConfiguration.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.pde.internal.ds.ui.editor.contentassist.DSContentAssistProcessor;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.text.IColorManager;
-import org.eclipse.pde.internal.ui.editor.text.XMLConfiguration;
-import org.eclipse.pde.internal.ui.editor.text.XMLPartitionScanner;
-
-public class DSSourceViewerConfiguration extends XMLConfiguration {
-
-	private ContentAssistant fContentAssistant;
-	private DSContentAssistProcessor fContentAssistProcessor;
-	private DSTextHover fTextHover;
-
-	public DSSourceViewerConfiguration(IColorManager colorManager,
-			PDESourcePage page) {
-		super(colorManager, page);
-	}
-
-	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-		if (sourceViewer.isEditable() && fContentAssistant == null) {
-			fContentAssistProcessor = new DSContentAssistProcessor(fSourcePage);
-			fContentAssistant = new ContentAssistant();
-			fContentAssistant
-					.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
-			fContentAssistant.setContentAssistProcessor(
-					fContentAssistProcessor, IDocument.DEFAULT_CONTENT_TYPE);
-			fContentAssistant.setContentAssistProcessor(
-					fContentAssistProcessor, XMLPartitionScanner.XML_TAG);
-			fContentAssistant
-					.setInformationControlCreator(getInformationControlCreator(true));
-			fContentAssistant.setShowEmptyList(false);
-			fContentAssistant.addCompletionListener(fContentAssistProcessor);
-			fContentAssistant.enableAutoInsert(true);
-		}
-		return fContentAssistant;
-	}
-
-	public void dispose() {
-		if (fContentAssistProcessor != null)
-			fContentAssistProcessor.dispose();
-		super.dispose();
-	}
-
-	public ITextHover getTextHover(ISourceViewer sourceViewer,
-			String contentType) {
-		if (fTextHover == null && fSourcePage != null)
-			fTextHover = new DSTextHover(fSourcePage);
-		return fTextHover;
-	}
-
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java
deleted file mode 100644
index 36ae4b7..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTextHover.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.text.PDETextHover;
-
-public class DSTextHover extends PDETextHover {
-
-	private PDESourcePage fSourcePage;
-
-	public DSTextHover(PDESourcePage sourcePage) {
-		fSourcePage = sourcePage;
-	}
-
-	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-		int offset = hoverRegion.getOffset();
-		IDocumentRange range = fSourcePage.getRangeElement(offset, true);
-		if (range instanceof IDocumentTextNode)
-			return checkTranslatedValue((IDocumentTextNode) range);
-		if (!(range instanceof IDSObject))
-			return null;
-
-		return ((IDSObject) range).getName();
-
-	}
-
-	private String checkTranslatedValue(IDocumentTextNode node) {
-		String value = node.getText();
-		if (value.startsWith("%")) //$NON-NLS-1$
-			return ((IPluginObject) node.getEnclosingElement())
-					.getResourceString(value);
-
-		return null;
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTypeSelectionExtension.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTypeSelectionExtension.java
deleted file mode 100644
index 4a89d8b..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/DSTypeSelectionExtension.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.ui.dialogs.ITypeInfoFilterExtension;
-import org.eclipse.jdt.ui.dialogs.ITypeInfoRequestor;
-import org.eclipse.jdt.ui.dialogs.TypeSelectionExtension;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSService;
-
-public class DSTypeSelectionExtension extends TypeSelectionExtension {
-
-	private IDSModel fModel;
-
-	class TypeInfoFilterExtension implements ITypeInfoFilterExtension {
-
-		List fProvides = new ArrayList(3);
-
-		public TypeInfoFilterExtension(IDSProvide[] provides) {
-			for (int i = 0; i < provides.length; i++) {
-				fProvides.add(provides[i].getInterface());
-			}
-		}
-
-		public boolean select(ITypeInfoRequestor typeInfoRequestor) {
-			StringBuffer buffer = new StringBuffer(typeInfoRequestor.getPackageName());
-			buffer.append("."); //$NON-NLS-1$
-			buffer.append(typeInfoRequestor.getTypeName());
-			return !fProvides.contains(buffer.toString());
-		}
-
-	}
-
-	public DSTypeSelectionExtension() {
-
-	}
-
-	public DSTypeSelectionExtension(IDSModel model) {
-		fModel = model;
-	}
-
-	public ITypeInfoFilterExtension getFilterExtension() {
-		IDSService service = fModel.getDSComponent().getService();
-		if (service != null)
-			return new TypeInfoFilterExtension(service.getProvidedServices());
-		return null;
-	}
-
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java
deleted file mode 100644
index c907243..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormEntryAdapter.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ds.ui.parts.IFormEntryListener;
-import org.eclipse.pde.internal.ui.editor.IContextPart;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-
-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/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormLayoutFactory.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormLayoutFactory.java
deleted file mode 100644
index 4816f33..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/FormLayoutFactory.java
+++ /dev/null

@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor;
-
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * FormLayoutFactory
- * 
- */
-public class FormLayoutFactory {
-
-	// Used in place of 0. If 0 is used, widget borders will appear clipped
-	// on some platforms (e.g. Windows XP Classic Theme).
-	// Form tool kit requires parent composites containing the widget to have
-	// at least 1 pixel border margins in order to paint the flat borders.
-	// The form toolkit paints flat borders on a given widget when native
-	// borders are not painted by SWT. See FormToolkit#paintBordersFor()
-	public static final int DEFAULT_CLEAR_MARGIN = 2;
-
-	// Required to allow space for field decorations
-	public static final int CONTROL_HORIZONTAL_INDENT = 3;
-
-	// UI Forms Standards
-
-	// FORM BODY
-	public static final int FORM_BODY_MARGIN_TOP = 12;
-	public static final int FORM_BODY_MARGIN_BOTTOM = 12;
-	public static final int FORM_BODY_MARGIN_LEFT = 6;
-	public static final int FORM_BODY_MARGIN_RIGHT = 6;
-	public static final int FORM_BODY_HORIZONTAL_SPACING = 20;
-	// Should be 20; but, we minus 3 because the section automatically pads the
-	// bottom margin by that amount
-	public static final int FORM_BODY_VERTICAL_SPACING = 17;
-	public static final int FORM_BODY_MARGIN_HEIGHT = 0;
-	public static final int FORM_BODY_MARGIN_WIDTH = 0;
-
-	// SECTION CLIENT
-	public static final int SECTION_CLIENT_MARGIN_TOP = 5;
-	public static final int SECTION_CLIENT_MARGIN_BOTTOM = 5;
-	// Should be 6; but, we minus 4 because the section automatically pads the
-	// left margin by that amount
-	public static final int SECTION_CLIENT_MARGIN_LEFT = 2;
-	// Should be 6; but, we minus 4 because the section automatically pads the
-	// right margin by that amount
-	public static final int SECTION_CLIENT_MARGIN_RIGHT = 2;
-	public static final int SECTION_CLIENT_HORIZONTAL_SPACING = 5;
-	public static final int SECTION_CLIENT_VERTICAL_SPACING = 5;
-	public static final int SECTION_CLIENT_MARGIN_HEIGHT = 0;
-	public static final int SECTION_CLIENT_MARGIN_WIDTH = 0;
-
-	public static final int SECTION_HEADER_VERTICAL_SPACING = 6;
-
-	// CLEAR
-	public static final int CLEAR_MARGIN_TOP = DEFAULT_CLEAR_MARGIN;
-	public static final int CLEAR_MARGIN_BOTTOM = DEFAULT_CLEAR_MARGIN;
-	public static final int CLEAR_MARGIN_LEFT = DEFAULT_CLEAR_MARGIN;
-	public static final int CLEAR_MARGIN_RIGHT = DEFAULT_CLEAR_MARGIN;
-	public static final int CLEAR_HORIZONTAL_SPACING = 0;
-	public static final int CLEAR_VERTICAL_SPACING = 0;
-	public static final int CLEAR_MARGIN_HEIGHT = 0;
-	public static final int CLEAR_MARGIN_WIDTH = 0;
-
-	// FORM PANE
-	public static final int FORM_PANE_MARGIN_TOP = 0;
-	public static final int FORM_PANE_MARGIN_BOTTOM = 0;
-	public static final int FORM_PANE_MARGIN_LEFT = 0;
-	public static final int FORM_PANE_MARGIN_RIGHT = 0;
-	public static final int FORM_PANE_HORIZONTAL_SPACING = FORM_BODY_HORIZONTAL_SPACING;
-	public static final int FORM_PANE_VERTICAL_SPACING = FORM_BODY_VERTICAL_SPACING;
-	public static final int FORM_PANE_MARGIN_HEIGHT = 0;
-	public static final int FORM_PANE_MARGIN_WIDTH = 0;
-
-	// MASTER DETAILS
-	public static final int MASTER_DETAILS_MARGIN_TOP = 0;
-	public static final int MASTER_DETAILS_MARGIN_BOTTOM = 0;
-	// Used only by masters part. Details part margin dynamically calculated
-	public static final int MASTER_DETAILS_MARGIN_LEFT = 0;
-	// Used only by details part. Masters part margin dynamically calcualated
-	public static final int MASTER_DETAILS_MARGIN_RIGHT = 1;
-	public static final int MASTER_DETAILS_HORIZONTAL_SPACING = FORM_BODY_HORIZONTAL_SPACING;
-	public static final int MASTER_DETAILS_VERTICAL_SPACING = FORM_BODY_VERTICAL_SPACING;
-	public static final int MASTER_DETAILS_MARGIN_HEIGHT = 0;
-	public static final int MASTER_DETAILS_MARGIN_WIDTH = 0;
-
-	/**
-	 * 
-	 */
-	private FormLayoutFactory() {
-		// NO-OP
-	}
-
-	/**
-	 * For form bodies.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static GridLayout createFormGridLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		GridLayout layout = new GridLayout();
-
-		layout.marginHeight = FORM_BODY_MARGIN_HEIGHT;
-		layout.marginWidth = FORM_BODY_MARGIN_WIDTH;
-
-		layout.marginTop = FORM_BODY_MARGIN_TOP;
-		layout.marginBottom = FORM_BODY_MARGIN_BOTTOM;
-		layout.marginLeft = FORM_BODY_MARGIN_LEFT;
-		layout.marginRight = FORM_BODY_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = FORM_BODY_HORIZONTAL_SPACING;
-		layout.verticalSpacing = FORM_BODY_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For miscellaneous grouping composites. For sections (as a whole - header
-	 * plus client).
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static GridLayout createClearGridLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		GridLayout layout = new GridLayout();
-
-		layout.marginHeight = CLEAR_MARGIN_HEIGHT;
-		layout.marginWidth = CLEAR_MARGIN_WIDTH;
-
-		layout.marginTop = CLEAR_MARGIN_TOP;
-		layout.marginBottom = CLEAR_MARGIN_BOTTOM;
-		layout.marginLeft = CLEAR_MARGIN_LEFT;
-		layout.marginRight = CLEAR_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = CLEAR_HORIZONTAL_SPACING;
-		layout.verticalSpacing = CLEAR_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For form bodies.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static TableWrapLayout createFormTableWrapLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		TableWrapLayout layout = new TableWrapLayout();
-
-		layout.topMargin = FORM_BODY_MARGIN_TOP;
-		layout.bottomMargin = FORM_BODY_MARGIN_BOTTOM;
-		layout.leftMargin = FORM_BODY_MARGIN_LEFT;
-		layout.rightMargin = FORM_BODY_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = FORM_BODY_HORIZONTAL_SPACING;
-		layout.verticalSpacing = FORM_BODY_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For composites used to group sections in left and right panes.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static TableWrapLayout createFormPaneTableWrapLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		TableWrapLayout layout = new TableWrapLayout();
-
-		layout.topMargin = FORM_PANE_MARGIN_TOP;
-		layout.bottomMargin = FORM_PANE_MARGIN_BOTTOM;
-		layout.leftMargin = FORM_PANE_MARGIN_LEFT;
-		layout.rightMargin = FORM_PANE_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = FORM_PANE_HORIZONTAL_SPACING;
-		layout.verticalSpacing = FORM_PANE_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For composites used to group sections in left and right panes.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static GridLayout createFormPaneGridLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		GridLayout layout = new GridLayout();
-
-		layout.marginHeight = FORM_PANE_MARGIN_HEIGHT;
-		layout.marginWidth = FORM_PANE_MARGIN_WIDTH;
-
-		layout.marginTop = FORM_PANE_MARGIN_TOP;
-		layout.marginBottom = FORM_PANE_MARGIN_BOTTOM;
-		layout.marginLeft = FORM_PANE_MARGIN_LEFT;
-		layout.marginRight = FORM_PANE_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = FORM_PANE_HORIZONTAL_SPACING;
-		layout.verticalSpacing = FORM_PANE_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For miscellaneous grouping composites. For sections (as a whole - header
-	 * plus client).
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static TableWrapLayout createClearTableWrapLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		TableWrapLayout layout = new TableWrapLayout();
-
-		layout.topMargin = CLEAR_MARGIN_TOP;
-		layout.bottomMargin = CLEAR_MARGIN_BOTTOM;
-		layout.leftMargin = CLEAR_MARGIN_LEFT;
-		layout.rightMargin = CLEAR_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = CLEAR_HORIZONTAL_SPACING;
-		layout.verticalSpacing = CLEAR_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For master sections belonging to a master details block.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static GridLayout createMasterGridLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		GridLayout layout = new GridLayout();
-
-		layout.marginHeight = MASTER_DETAILS_MARGIN_HEIGHT;
-		layout.marginWidth = MASTER_DETAILS_MARGIN_WIDTH;
-
-		layout.marginTop = MASTER_DETAILS_MARGIN_TOP;
-		layout.marginBottom = MASTER_DETAILS_MARGIN_BOTTOM;
-		layout.marginLeft = MASTER_DETAILS_MARGIN_LEFT;
-		// Cannot set layout on a sash form.
-		// In order to replicate the horizontal spacing between sections,
-		// divide the amount by 2 and set the master section right margin to
-		// half the amount and set the left details section margin to half
-		// the amount. The default sash width is currently set at 3.
-		// Minus 1 pixel from each half. Use the 1 left over pixel to separate
-		// the details section from the vertical scollbar.
-		int marginRight = MASTER_DETAILS_HORIZONTAL_SPACING;
-		if (marginRight > 0) {
-			marginRight = marginRight / 2;
-			if (marginRight > 0) {
-				marginRight--;
-			}
-		}
-		layout.marginRight = marginRight;
-
-		layout.horizontalSpacing = MASTER_DETAILS_HORIZONTAL_SPACING;
-		layout.verticalSpacing = MASTER_DETAILS_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For details sections belonging to a master details block.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static GridLayout createDetailsGridLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		GridLayout layout = new GridLayout();
-
-		layout.marginHeight = MASTER_DETAILS_MARGIN_HEIGHT;
-		layout.marginWidth = MASTER_DETAILS_MARGIN_WIDTH;
-
-		layout.marginTop = MASTER_DETAILS_MARGIN_TOP;
-		layout.marginBottom = MASTER_DETAILS_MARGIN_BOTTOM;
-		// Cannot set layout on a sash form.
-		// In order to replicate the horizontal spacing between sections,
-		// divide the amount by 2 and set the master section right margin to
-		// half the amount and set the left details section margin to half
-		// the amount. The default sash width is currently set at 3.
-		// Minus 1 pixel from each half. Use the 1 left over pixel to separate
-		// the details section from the vertical scollbar.
-		int marginLeft = MASTER_DETAILS_HORIZONTAL_SPACING;
-		if (marginLeft > 0) {
-			marginLeft = marginLeft / 2;
-			if (marginLeft > 0) {
-				marginLeft--;
-			}
-		}
-		layout.marginLeft = marginLeft;
-		layout.marginRight = MASTER_DETAILS_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = MASTER_DETAILS_HORIZONTAL_SPACING;
-		layout.verticalSpacing = MASTER_DETAILS_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For composites set as section clients. For composites containg form text.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static GridLayout createSectionClientGridLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		GridLayout layout = new GridLayout();
-
-		layout.marginHeight = SECTION_CLIENT_MARGIN_HEIGHT;
-		layout.marginWidth = SECTION_CLIENT_MARGIN_WIDTH;
-
-		layout.marginTop = SECTION_CLIENT_MARGIN_TOP;
-		layout.marginBottom = SECTION_CLIENT_MARGIN_BOTTOM;
-		layout.marginLeft = SECTION_CLIENT_MARGIN_LEFT;
-		layout.marginRight = SECTION_CLIENT_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = SECTION_CLIENT_HORIZONTAL_SPACING;
-		layout.verticalSpacing = SECTION_CLIENT_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * For composites set as section clients. For composites containg form text.
-	 * 
-	 * @param makeColumnsEqualWidth
-	 * @param numColumns
-	 * @return
-	 */
-	public static TableWrapLayout createSectionClientTableWrapLayout(
-			boolean makeColumnsEqualWidth, int numColumns) {
-		TableWrapLayout layout = new TableWrapLayout();
-
-		layout.topMargin = SECTION_CLIENT_MARGIN_TOP;
-		layout.bottomMargin = SECTION_CLIENT_MARGIN_BOTTOM;
-		layout.leftMargin = SECTION_CLIENT_MARGIN_LEFT;
-		layout.rightMargin = SECTION_CLIENT_MARGIN_RIGHT;
-
-		layout.horizontalSpacing = SECTION_CLIENT_HORIZONTAL_SPACING;
-		layout.verticalSpacing = SECTION_CLIENT_VERTICAL_SPACING;
-
-		layout.makeColumnsEqualWidth = makeColumnsEqualWidth;
-		layout.numColumns = numColumns;
-
-		return layout;
-	}
-
-	/**
-	 * Debug method.
-	 * 
-	 * MAGENTA = 11 CYAN = 13 GREEN = 5
-	 * 
-	 * @param container
-	 * @param color
-	 */
-	public static void visualizeLayoutArea(Composite container, int color) {
-		container.setBackground(Display.getCurrent().getSystemColor(color));
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSAttrCompletionProposal.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSAttrCompletionProposal.java
deleted file mode 100644
index b706094..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSAttrCompletionProposal.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.contentassist;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.ui.SharedImages;
-import org.eclipse.swt.graphics.Point;
-
-public class DSAttrCompletionProposal extends TypeCompletionProposal implements
-		ICompletionProposal {
-
-	public DSAttrCompletionProposal(String string,
-			int startOffset, int length) {
-		super(getReplacementString(string), SharedImages
-				.getImage(SharedImages.DESC_ATTR), string,
-				startOffset, length);
-	}
-
-	public Point getSelection(IDocument document) {
-		return new Point(this.fBeginInsertPoint + fReplacementString.length()
-				- 1, 0);
-	}
-
-	/**
-	 * Returns a String to be replaced by the Content Assist with default values
-	 * or with a repeated String if there is no default value.
-	 * 
-	 * Example: enabled="true" and entry="entry"
-	 * 
-	 * @param attribute
-	 *            the name of attribute
-	 * @return a String containing the replacementString
-	 */
-	private static String getReplacementString(String attribute) {
-		String replacementString = null;
-		if (attribute == null) {
-			return null;
-		}
-		String string1 = "=\""; //$NON-NLS-1$
-		String string2 = "\""; //$NON-NLS-1$
-
-		if (attribute.equals(IDSConstants.ATTRIBUTE_COMPONENT_ENABLED)) {
-			replacementString = attribute + string1
- + IDSConstants.VALUE_TRUE
-					+ string2;
-		} else if (attribute
-				.equals(IDSConstants.ATTRIBUTE_COMPONENT_IMMEDIATE)) {
-			replacementString = attribute + string1
- + IDSConstants.VALUE_FALSE
-					+ string2;
-		} else if (attribute.equals(IDSConstants.ATTRIBUTE_PROPERTY_TYPE)) {
-			replacementString = attribute + string1
-					+ IDSConstants.VALUE_PROPERTY_TYPE_STRING + string2;
-		} else if (attribute.equals(IDSConstants.ATTRIBUTE_SERVICE_FACTORY)) {
-			replacementString = attribute + string1
- + IDSConstants.VALUE_FALSE
-					+ string2;
-		} else if (attribute
-				.equals(IDSConstants.ATTRIBUTE_REFERENCE_TARGET)) {
-			replacementString = attribute + string1
-					+ IDSConstants.VALUE_DEFAULT_TARGET + string2;
-		} else if (attribute
-				.equals(IDSConstants.ATTRIBUTE_REFERENCE_CARDINALITY)) {
-			replacementString = attribute + string1
-					+ IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_ONE
-					+ string2;
-		} else if (attribute
-				.equals(IDSConstants.ATTRIBUTE_REFERENCE_POLICY)) {
-			replacementString = attribute + string1
-					+ IDSConstants.VALUE_REFERENCE_POLICY_STATIC + string2;
-		} else if (attribute
-				.equals(IDSConstants.ATTRIBUTE_COMPONENT_CONFIGURATION_POLICY)) {
-			replacementString = attribute + string1
-					+ IDSConstants.VALUE_CONFIGURATION_POLICY_OPTIONAL
-					+ string2;
-		} else {
-			replacementString = attribute + string1 + attribute
- + string2;
-		}
-		return replacementString;
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java
deleted file mode 100644
index e2520a6..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSCompletionProposal.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.contentassist;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-import org.eclipse.pde.internal.ds.ui.SharedImages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
-public class DSCompletionProposal implements ICompletionProposal {
-
-	private IDSObject fObject;
-	private int fStartOffset;
-	private int fLength;
-
-	public DSCompletionProposal(IDSObject object, int startOffset) {
-		this(object, startOffset, 0);
-	}
-
-	public DSCompletionProposal(IDSObject object, int startOffset, int length) {
-		fObject = object;
-		fStartOffset = startOffset;
-		fLength = length;
-	}
-
-	public void apply(IDocument document) {
-		try {
-			document.replace(fStartOffset, fLength, fObject.toString());
-		} catch (BadLocationException e) {
-			// DEBUG
-			// e.printStackTrace();
-		}
-	}
-
-	public String getAdditionalProposalInfo() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IContextInformation getContextInformation() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getDisplayString() {
-		return this.getTextbyType(fObject.getType());
-	}
-
-	private String getTextbyType(int type) {
-		switch (type) {
-		case IDSConstants.TYPE_PROPERTIES:
-			return IDSConstants.ELEMENT_PROPERTIES;
-
-		case IDSConstants.TYPE_PROPERTY:
-			return IDSConstants.ELEMENT_PROPERTY;
-
-		case IDSConstants.TYPE_PROVIDE:
-			return IDSConstants.ELEMENT_PROVIDE;
-
-		case IDSConstants.TYPE_REFERENCE:
-			return IDSConstants.ELEMENT_REFERENCE;
-
-		case IDSConstants.TYPE_SERVICE:
-			return IDSConstants.ELEMENT_SERVICE;
-
-		case IDSConstants.TYPE_IMPLEMENTATION:
-			return IDSConstants.ELEMENT_IMPLEMENTATION;
-
-		case IDSConstants.TYPE_COMPONENT:
-			return IDSConstants.ELEMENT_COMPONENT;
-
-		default:
-			return null;
-		}
-	}
-
-	public Image getImage() {
-		if (fObject.getType() == IDSConstants.TYPE_IMPLEMENTATION) {
-			return SharedImages.getImage(SharedImages.DESC_IMPLEMENTATION);
-		} else if (fObject.getType() == IDSConstants.TYPE_PROPERTIES) {
-			return SharedImages.getImage(SharedImages.DESC_PROPERTIES);
-		} else if (fObject.getType() == IDSConstants.TYPE_PROPERTY) {
-			return SharedImages.getImage(SharedImages.DESC_PROPERTY);
-		} else if (fObject.getType() == IDSConstants.TYPE_PROVIDE) {
-			return SharedImages.getImage(SharedImages.DESC_PROVIDE);
-		} else if (fObject.getType() == IDSConstants.TYPE_REFERENCE) {
-			return SharedImages.getImage(SharedImages.DESC_REFERENCE);
-		} else if (fObject.getType() == IDSConstants.TYPE_COMPONENT) {
-			return SharedImages.getImage(SharedImages.DESC_ROOT);
-		} else if (fObject.getType() == IDSConstants.TYPE_SERVICE) {
-			return SharedImages.getImage(SharedImages.DESC_SERVICE);
-		}
-		return null;
-	}
-
-	public Point getSelection(IDocument document) {
-		return new Point(fStartOffset + fObject.toString().length(), 0);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java
deleted file mode 100644
index c213c87..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistProcessor.java
+++ /dev/null

@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.contentassist;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ContentAssistEvent;
-import org.eclipse.jface.text.contentassist.ICompletionListener;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.core.text.AbstractEditingModel;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.core.text.IReconcilingParticipant;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSObject;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSService;
-import org.eclipse.pde.internal.ds.core.text.DSModel;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-
-public class DSContentAssistProcessor extends TypePackageCompletionProcessor
-		implements IContentAssistProcessor, ICompletionListener {
-	protected boolean fAssistSessionStarted;
-
-	private PDESourcePage fSourcePage;
-
-	private IDocumentRange fRange;
-
-	// proposal generation type
-	private static final int F_NO_ASSIST = 0, F_ADD_ATTRIB = 1,
-			F_ADD_CHILD = 2, F_OPEN_TAG = 3;
-
-	public DSContentAssistProcessor(PDESourcePage sourcePage) {
-		fSourcePage = sourcePage;
-	}
-
-	public void assistSessionEnded(ContentAssistEvent event) {
-		fRange = null;
-	}
-
-	public void assistSessionStarted(ContentAssistEvent event) {
-		fAssistSessionStarted = true;
-	}
-
-	public void selectionChanged(ICompletionProposal proposal,
-			boolean smartToggle) {
-	}
-
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
-			int offset) {
-		IDocument doc = viewer.getDocument();
-		IBaseModel model = fSourcePage.getInputContext().getModel();
-
-		if (model instanceof AbstractEditingModel && fSourcePage.isDirty()
-				&& ((AbstractEditingModel) model).isStale() && fRange == null) {
-			((AbstractEditingModel) model).reconciled(doc);
-		} else if (fAssistSessionStarted) {
-			// Always reconcile when content assist is first invoked
-			// Fix Bug # 149478
-			((AbstractEditingModel) model).reconciled(doc);
-			fAssistSessionStarted = false;
-		}
-
-		if (fRange == null) {
-			assignRange(offset);
-		} else {
-			// TODO - we may be looking at the wrong fRange
-			// when this happens --> reset it and reconcile
-			// how can we tell if we are looking at the wrong one... ?
-			boolean resetAndReconcile = false;
-			if (!(fRange instanceof IDocumentAttributeNode))
-				// too easy to reconcile.. this is temporary
-				resetAndReconcile = true;
-
-			if (resetAndReconcile) {
-				fRange = null;
-				if (model instanceof IReconcilingParticipant)
-					((IReconcilingParticipant) model).reconciled(doc);
-			}
-		}
-		// Get content assist text if any
-		DSContentAssistText caText = DSContentAssistText.parse(offset, doc);
-
-		if (caText != null) {
-			return computeCATextProposal(doc, offset, caText);
-		} else if (fRange instanceof IDocumentAttributeNode) {
-			return computeCompletionProposal((IDocumentAttributeNode) fRange,
-					offset, doc);
-		} else if (fRange instanceof IDocumentElementNode) {
-			return computeCompletionProposal((IDocumentElementNode) fRange,
-					offset, doc);
-		}
-		return null;
-	}
-
-	private ICompletionProposal[] computeCATextProposal(IDocument doc,
-			int offset, DSContentAssistText caText) {
-		fRange = fSourcePage.getRangeElement(offset, true);
-		if ((fRange != null) && (fRange instanceof IDocumentTextNode)) {
-			// We have a text node.
-			// Get its parent element
-			fRange = ((IDocumentTextNode) fRange).getEnclosingElement();
-		}
-		if ((fRange != null) && (fRange instanceof IDocumentElementNode)) {
-			return computeAddChildProposal((IDocumentElementNode) fRange,
-					caText.getStartOffset(), doc, caText.getText());
-		}
-
-		return null;
-	}
-
-	private ICompletionProposal[] computeCompletionProposal(
-			IDocumentAttributeNode attr, int offset, IDocument doc) {
-		if (offset < attr.getValueOffset())
-			return null;
-		int[] offests = new int[] { offset, offset, offset };
-		String[] guess = guessContentRequest(offests, doc, false);
-		if (guess == null)
-			return null;
-
-		// Element name
-		String element = guess[0];
-		// Attr name
-		String attribute = guess[1];
-		// Attr value
-		String attrValue = guess[2];
-
-		int attrValueLength = attrValue == null ? 0 : attrValue.length();
-		int startOffset = offests[2] + 1;
-
-		// Component
-		if (element != null
-				&& element.equals("scr:" + IDSConstants.ELEMENT_COMPONENT)) { //$NON-NLS-1$
-			boolean isAttrImmediate = attribute == null ? false : attribute
-					.equals(IDSConstants.ATTRIBUTE_COMPONENT_IMMEDIATE);
-			boolean isAttrEnabled = attribute == null ? false : attribute
-					.equals(IDSConstants.ATTRIBUTE_COMPONENT_ENABLED);
-			boolean isAttrConfigPolicy = attribute == null ? false : attribute
-					.equals(IDSConstants.ATTRIBUTE_COMPONENT_CONFIGURATION_POLICY);
-			if ((isAttrImmediate || isAttrEnabled)) {
-				return getCompletionBooleans(startOffset, attrValueLength);
-			}
-			if (isAttrConfigPolicy) {
-				return getConfigurationPolicyValues(attrValueLength,
-						startOffset);
-			}
-			// Service
-		} else if (element != null
-				&& element.equals(IDSConstants.ELEMENT_SERVICE)) {
-			boolean isAttrServFactory = attribute == null ? false : attribute
-					.equals(IDSConstants.ATTRIBUTE_SERVICE_FACTORY);
-			if (isAttrServFactory) {
-				return getCompletionBooleans(startOffset, attrValueLength);
-			}
-			// Reference
-		} else if (element != null
-				&& element.equals(IDSConstants.ELEMENT_REFERENCE)) {
-			boolean isAttrCardinality = attribute == null ? false : attribute
-					.equals(IDSConstants.ATTRIBUTE_REFERENCE_CARDINALITY);
-			boolean isAttrPolicy = attribute == null ? false : attribute
-					.equals(IDSConstants.ATTRIBUTE_REFERENCE_POLICY);
-			if (isAttrCardinality) {
-				return getReferenceCardinalityValues(attrValueLength,
-						startOffset);
-			} else if (isAttrPolicy) {
-				return getReferencePolicyValues(attrValueLength, startOffset);
-
-			}
-			// Property
-		} else if (element != null
-				&& element.equals(IDSConstants.ELEMENT_PROPERTY)) {
-			boolean isAttrType = attribute == null ? false : attribute
-					.equals(IDSConstants.ATTRIBUTE_PROPERTY_TYPE);
-			if (isAttrType) {
-				return getPropertyTypeValues(attrValueLength, startOffset);
-			}
-
-		}
-		return null;
-	}
-
-	/**
-	 * Returns completion proposal with permitted values for Reference`s policy
-	 * attribute
-	 * 
-	 * @param attrValueLength
-	 * @param startOffset
-	 * @return ICompletionProposal array with completion proposals
-	 */
-	private ICompletionProposal[] getReferencePolicyValues(int attrValueLength,
-			int startOffset) {
-		return new ICompletionProposal[] {
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_REFERENCE_POLICY_STATIC, null,
-						IDSConstants.VALUE_REFERENCE_POLICY_STATIC,
-						startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_REFERENCE_POLICY_DYNAMIC, null,
-						IDSConstants.VALUE_REFERENCE_POLICY_DYNAMIC,
-						startOffset, attrValueLength) };
-	}
-
-	private ICompletionProposal[] getConfigurationPolicyValues(
-			int attrValueLength, int startOffset) {
-		return new ICompletionProposal[] {
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_CONFIGURATION_POLICY_IGNORE,
-						null,
-						IDSConstants.VALUE_CONFIGURATION_POLICY_IGNORE,
-						startOffset, attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_CONFIGURATION_POLICY_OPTIONAL, null,
-						IDSConstants.VALUE_CONFIGURATION_POLICY_OPTIONAL,
-						startOffset, attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_CONFIGURATION_POLICY_REQUIRE, null,
-						IDSConstants.VALUE_CONFIGURATION_POLICY_REQUIRE,
-						startOffset, attrValueLength) };
-	}
-
-	private ICompletionProposal[] getReferenceCardinalityValues(
-			int attrValueLength, int startOffset) {
-		return new ICompletionProposal[] {
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_ONE,
-						null,
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_ONE,
-						startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_N, null,
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_N,
-						startOffset, attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_ONE, null,
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_ONE,
-						startOffset, attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_N, null,
-						IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_N,
-						startOffset, attrValueLength) };
-	}
-
-	private ICompletionProposal[] getPropertyTypeValues(int attrValueLength,
-			int startOffset) {
-		return new ICompletionProposal[] {
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_STRING, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_STRING, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_LONG, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_LONG, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_DOUBLE, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_DOUBLE, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_FLOAT, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_FLOAT, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_INTEGER, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_INTEGER, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_BYTE, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_BYTE, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_CHAR, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_CHAR, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_BOOLEAN, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_BOOLEAN, startOffset,
-						attrValueLength),
-				new TypeCompletionProposal(
-						IDSConstants.VALUE_PROPERTY_TYPE_SHORT, null,
-						IDSConstants.VALUE_PROPERTY_TYPE_SHORT, startOffset,
-						attrValueLength) };
-	}
-
-	private ICompletionProposal[] getCompletionBooleans(int startOffset,
-			int attrValueLength) {
-
-		return new ICompletionProposal[] {
-				new TypeCompletionProposal(IDSConstants.VALUE_TRUE, null,
-						IDSConstants.VALUE_TRUE, startOffset, attrValueLength),
-				new TypeCompletionProposal(IDSConstants.VALUE_FALSE, null,
-						IDSConstants.VALUE_FALSE, startOffset, attrValueLength) };
-	}
-
-	private ICompletionProposal[] computeCompletionProposal(
-			IDocumentElementNode node, int offset, IDocument doc) {
-		int prop_type = determineAssistType(node, doc, offset);
-		switch (prop_type) {
-		case F_ADD_ATTRIB:
-			return computeAddAttributeProposal(node, offset, doc, null, node
-					.getXMLTagName());
-			// case F_OPEN_TAG:
-			// return new ICompletionProposal[] { new TypeCompletionProposal(
-			// "Open Tag", null, "Open Tag", offset, 0) };
-		case F_ADD_CHILD:
-			return computeAddChildProposal(node, offset, doc, null);
-		}
-		return null;
-	}
-
-	private ICompletionProposal[] computeAddAttributeProposal(
-			IDocumentElementNode node, int offset, IDocument doc,
-			String filter, String tag) {
-
-		ArrayList proposals = new ArrayList();
-
-		if (!(node instanceof IDSObject)) {
-			return null;
-		}
-		String[] attributesList = ((IDSObject) node).getAttributesNames();
-
-		if (attributesList == null || attributesList.length == 0) {
-			return null;
-		} else {
-			for (int i = 0; i < attributesList.length; i++) {
-				String attribute = attributesList[i];
-				// Lists all attributes already in use
-				IDocumentAttributeNode[] nodeAttributes = node
-						.getNodeAttributes();
-				boolean EqualToAnyItem = false;
-				for (int j = 0; j < nodeAttributes.length; j++) {
-					IDocumentAttributeNode documentAttributeNode = nodeAttributes[j];
-					EqualToAnyItem |= attribute.equals(documentAttributeNode
-							.getAttributeName());
-
-				}
-				// If the attribute is not in use, add it in the
-				// CompletionProposal
-				if (EqualToAnyItem == false) {
-					DSAttrCompletionProposal dsAttrCompletionProposal = new DSAttrCompletionProposal(
-							attributesList[i], offset, 0);
-					addFilteredProposal(offset, proposals,
-							dsAttrCompletionProposal, filter);
-				}
-
-			}
-		}
-
-		// cast the proposal elements to ICompletionProposal
-		if (proposals.size() > 0) {
-			ICompletionProposal proposalsArray[] = new ICompletionProposal[proposals
-					.size()];
-			for (int i = 0; i < proposals.size(); i++) {
-				proposalsArray[i] = (ICompletionProposal) proposals.get(i);
-
-			}
-			return proposalsArray;
-		} else {
-			return null;
-		}
-	}
-
-	private ICompletionProposal[] computeAddChildProposal(
-			IDocumentElementNode node, int offset, IDocument doc, String filter) {
-		if (node instanceof IDSComponent) {
-			return computeRootNodeProposals(node, offset, filter);
-		} else if (node instanceof IDSService) {
-			DSModel model = (DSModel) fSourcePage.getInputContext().getModel();
-			IDSProvide provide = model.getFactory().createProvide();
-			return new DSCompletionProposal[] { new DSCompletionProposal(
-					provide, offset) };
-		} else {
-			return null;
-		}
-	}
-
-	private ICompletionProposal[] computeRootNodeProposals(
-			IDocumentElementNode node, int offset, String filter) {
-		ArrayList proposals = new ArrayList();
-		IDSModel model = (DSModel) fSourcePage.getInputContext().getModel();
-
-		IDSComponent component = model.getDSComponent();
-
-		int length = filter != null ? filter.length() : 0;
-
-		addFilteredProposal(offset, proposals, new DSCompletionProposal(model
-				.getFactory().createProperty(), offset, length),
-				filter);
-		addFilteredProposal(offset, proposals, new DSCompletionProposal(model
-				.getFactory().createProperties(), offset, length),
-				filter);
-		addFilteredProposal(offset, proposals, new DSCompletionProposal(model
-				.getFactory().createReference(), offset, length),
-				filter);
-		boolean hasService = component.getService() != null;
-		if (!hasService) {
-			addFilteredProposal(offset, proposals, new DSCompletionProposal(
-					model.getFactory().createService(), offset, length), filter);
-		}
-
-		if (component.getImplementation() == null) {
-			addFilteredProposal(offset, proposals, new DSCompletionProposal(
-					model.getFactory().createImplementation(), offset, length), filter);
-		}
-
-		ICompletionProposal[] proposalsArray = new DSCompletionProposal[proposals
-				.size()];
-		for (int i = 0; i < proposalsArray.length; i++) {
-			proposalsArray[i] = (ICompletionProposal) proposals.get(i);
-		}
-		return proposalsArray;
-
-	}
-
-	private void addFilteredProposal(int offset, ArrayList proposals,
-			DSCompletionProposal proposal, String filter) {
-		if (filter == null || filter.length() == 0) {
-			proposals.add(proposal);
-		} else {
-			if (filter.regionMatches(true, 0, proposal.getDisplayString(), 0,
-					filter.length()))
-				proposals.add(proposal);
-		}
-	}
-
-	private void addFilteredProposal(int offset, ArrayList proposals,
-			DSAttrCompletionProposal proposal, String filter) {
-		if (filter == null || filter.length() == 0) {
-			proposals.add(proposal);
-		} else {
-			if (filter.regionMatches(true, 0, proposal.getDisplayString(), 0,
-					filter.length()))
-				proposals.add(proposal);
-		}
-	}
-
-	private int determineAssistType(IDocumentElementNode node, IDocument doc,
-			int offset) {
-		int len = node.getLength();
-		int off = node.getOffset();
-		if (len == -1 || off == -1)
-			return F_NO_ASSIST;
-
-		offset = offset - off; // look locally
-		if (offset > node.getXMLTagName().length() + 1) {
-			try {
-				String eleValue = doc.get(off, len);
-				int ind = eleValue.indexOf('>');
-				if (ind > 0 && eleValue.charAt(ind - 1) == '/')
-					ind -= 1;
-				if (offset <= ind) {
-					if (canInsertAttrib(eleValue, offset))
-						return F_ADD_ATTRIB;
-					return F_NO_ASSIST;
-				}
-				ind = eleValue.lastIndexOf('<');
-				if (ind == 0 && offset == len - 1)
-					return F_OPEN_TAG; // childless node - check if it can be
-				// cracked open
-				if (ind + 1 < len && eleValue.charAt(ind + 1) == '/'
-						&& offset <= ind)
-					return F_ADD_CHILD;
-			} catch (BadLocationException e) {
-			}
-		}
-		return F_NO_ASSIST;
-	}
-
-	private boolean canInsertAttrib(String eleValue, int offset) {
-		// character before offset must be whitespace
-		// character on offset must be whitespace, '/' or '>'
-		char c = eleValue.charAt(offset);
-		return offset - 1 >= 0
-				&& Character.isWhitespace(eleValue.charAt(offset - 1))
-				&& (Character.isWhitespace(c) || c == '/' || c == '>');
-	}
-
-	private String[] guessContentRequest(int[] offset, IDocument doc,
-			boolean brokenModel) {
-		StringBuffer nodeBuffer = new StringBuffer();
-		StringBuffer attrBuffer = new StringBuffer();
-		StringBuffer attrValBuffer = new StringBuffer();
-		String node = null;
-		String attr = null;
-		String attVal = null;
-		int quoteCount = 0;
-		try {
-			while (--offset[0] >= 0) {
-				char c = doc.getChar(offset[0]);
-				if (c == '"') {
-					quoteCount += 1;
-					nodeBuffer.setLength(0);
-					attrBuffer.setLength(0);
-					if (attVal != null) // ran into 2nd quotation mark, we are
-						// out of range
-						continue;
-					offset[2] = offset[0];
-					attVal = attrValBuffer.toString();
-				} else if (Character.isWhitespace(c)) {
-					nodeBuffer.setLength(0);
-					if (attr == null) {
-						offset[1] = offset[0];
-						int attBuffLen = attrBuffer.length();
-						if (attBuffLen > 0
-								&& attrBuffer.charAt(attBuffLen - 1) == '=')
-							attrBuffer.setLength(attBuffLen - 1);
-						attr = attrBuffer.toString();
-					}
-				} else if (c == '<') {
-					node = nodeBuffer.toString();
-					break;
-				} else if (c == '>') {
-					// only enable content assist if user is inside an open tag
-					return null;
-				} else {
-					attrValBuffer.insert(0, c);
-					attrBuffer.insert(0, c);
-					nodeBuffer.insert(0, c);
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-		if (node == null)
-			return null;
-
-		if (quoteCount % 2 == 0)
-			attVal = null;
-		else if (brokenModel)
-			return null; // open quotes - don't provide assist
-
-		return new String[] { node, attr, attVal };
-	}
-
-	private void assignRange(int offset) {
-		fRange = fSourcePage.getRangeElement(offset, true);
-		if (fRange == null)
-			return;
-		// if we are rigth AT (cursor before) the range, we want to contribute
-		// to its parent
-		if (fRange instanceof IDocumentAttributeNode) {
-			if (((IDocumentAttributeNode) fRange).getNameOffset() == offset)
-				fRange = ((IDocumentAttributeNode) fRange)
-						.getEnclosingElement();
-		} else if (fRange instanceof IDocumentElementNode) {
-			if (((IDocumentElementNode) fRange).getOffset() == offset)
-				fRange = ((IDocumentElementNode) fRange).getParentNode();
-		} else if (fRange instanceof IDocumentTextNode) {
-			if (((IDocumentTextNode) fRange).getOffset() == offset)
-				fRange = ((IDocumentTextNode) fRange).getEnclosingElement();
-		}
-	}
-
-	public void dispose() {
-
-	}
-
-	protected ITextSelection getCurrentSelection() {
-		ISelection sel = fSourcePage.getSelectionProvider().getSelection();
-		if (sel instanceof ITextSelection)
-			return (ITextSelection) sel;
-		return null;
-	}
-
-	protected void flushDocument() {
-		fSourcePage.getInputContext().flushEditorInput();
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java
deleted file mode 100644
index 6cedcab..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/DSContentAssistText.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.contentassist;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-
-/**
- * Content assist text is any contiguous segment of text that can be construed
- * as the beginning of a element document node prior to invoking content assist
- * at the end of it.
- */
-public class DSContentAssistText {
-
-	private String fText;
-
-	private int fStartOffset;
-
-	private DSContentAssistText(String text, int startOffset) {
-		fText = text;
-		fStartOffset = startOffset;
-	}
-
-	/**
-	 * Parses document for content assist text.
-	 * 
-	 * @param offset
-	 *            The document offset to start scanning backward from
-	 * @param document
-	 *            The document
-	 * @return new content assist text if found; otherwise, returns null.
-	 */
-	public static DSContentAssistText parse(int offset, IDocument document) {
-		boolean writeCAText = true;
-		int lastCATextOffset = -1;
-		StringBuffer buffer = new StringBuffer();
-		int endOffset = offset - 1;
-		char currentChar;
-
-		if (offset <= 0) {
-			return null;
-		}
-		// Performance enhancement
-		// Ensure the first character is valid content assist text
-		try {
-			currentChar = document.getChar(endOffset);
-		} catch (BadLocationException e) {
-			return null;
-		}
-		if (isContentAssistText(currentChar)) {
-			buffer.append(currentChar);
-			lastCATextOffset = endOffset;
-		} else {
-			return null;
-		}
-		// Scan backwards from specified offset until we find a right angle
-		// bracket
-		for (int i = endOffset - 1; i > 0; i--) {
-			try {
-				currentChar = document.getChar(i);
-			} catch (BadLocationException e) {
-				return null;
-			}
-			if (isContentAssistText(currentChar)) {
-				if (writeCAText) {
-					// Accumulate the contiguous segment of content assist
-					// text
-					buffer.append(currentChar);
-					// Track the start offset of the contiguous segment of
-					// content assist text
-					lastCATextOffset = i;
-				}
-			} else if (Character.isWhitespace(currentChar)) {
-				// We found whitespace. This represents the contiguous text
-				// boundary. Do not write anything else to the buffer.
-				// Continue scanning backwards to make sure we find a right
-				// angle bracket to validate what we have in the buffer is
-				// indeed valid content assist text
-				writeCAText = false;
-			} else if (currentChar == '>') {
-				// We found the right angle bracket, if there is anything in
-				// the buffer it is valid content assist text
-				if (buffer.length() > 0) {
-					return new DSContentAssistText(buffer.reverse().toString(),
-							lastCATextOffset);
-				}
-				return null;
-			} else {
-				// We found an invalid content assist character
-				// Anything we have in the buffer is garbage
-				return null;
-			}
-		}
-		// We should never reach here
-		return null;
-	}
-
-	/**
-	 * Determines whether a character is a valid XML element name character
-	 * 
-	 * @param c
-	 *            A character
-	 * @return True if the character is valid content assist text; Otherwise,
-	 *         returns false.
-	 */
-	private static boolean isContentAssistText(char c) {
-		if ((Character.isLetterOrDigit(c)) || (c == '.') || (c == '-')
-				|| (c == '_') || (c == ':')) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @return the fText
-	 */
-	public String getText() {
-		return fText;
-	}
-
-	/**
-	 * @return the fStartOffset
-	 */
-	public int getStartOffset() {
-		return fStartOffset;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return "Start Offset: " + fStartOffset + " Text: |" + fText + "|\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypeCompletionProposal.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypeCompletionProposal.java
deleted file mode 100644
index e8231bd..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypeCompletionProposal.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.contentassist;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.internal.text.html.BrowserInformationControl;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.AbstractReusableInformationControlCreator;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension5;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
-
-public class TypeCompletionProposal implements ICompletionProposal, ICompletionProposalExtension3, ICompletionProposalExtension5 {
-
-	protected String fReplacementString;
-	protected Image fImage;
-	protected String fDisplayString;
-	protected int fBeginInsertPoint;
-	protected int fLength;
-	protected String fAdditionalInfo;
-	private IInformationControlCreator fCreator;
-
-	public TypeCompletionProposal(String replacementString, Image image, String displayString) {
-		this(replacementString, image, displayString, 0, 0);
-	}
-
-	public TypeCompletionProposal(String replacementString, Image image, String displayString, int startOffset, int length) {
-		Assert.isNotNull(replacementString);
-
-		fReplacementString = replacementString;
-		fImage = image;
-		fDisplayString = displayString;
-		fBeginInsertPoint = startOffset;
-		fLength = length;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
-	 */
-	public void apply(IDocument document) {
-		if (fLength == -1) {
-			String current = document.get();
-			fLength = current.length();
-		}
-		try {
-			document.replace(fBeginInsertPoint, fLength, fReplacementString);
-		} catch (BadLocationException e) {
-			// DEBUG
-			// e.printStackTrace();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		// No additional proposal information
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		// No context information
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		return fDisplayString;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument)
-	 */
-	public Point getSelection(IDocument document) {
-		if (fReplacementString.equals("\"\"")) //$NON-NLS-1$
-			return new Point(fBeginInsertPoint + 1, 0);
-		return new Point(fBeginInsertPoint + fReplacementString.length(), 0);
-	}
-
-	/**
-	 * @return
-	 */
-	public String getReplacementString() {
-		return fReplacementString;
-	}
-
-	public Object getAdditionalProposalInfo(IProgressMonitor monitor) {
-		return fAdditionalInfo;
-	}
-
-	public void setAdditionalProposalInfo(String info) {
-		fAdditionalInfo = info;
-	}
-
-	public IInformationControlCreator getInformationControlCreator() {
-		if (!BrowserInformationControl.isAvailable(null))
-			return null;
-
-		if (fCreator == null) {
-			fCreator = new AbstractReusableInformationControlCreator() {
-
-				/*
-				 * @see org.eclipse.jdt.internal.ui.text.java.hover.AbstractReusableInformationControlCreator#doCreateInformationControl(org.eclipse.swt.widgets.Shell)
-				 */
-				public IInformationControl doCreateInformationControl(Shell parent) {
-					return new BrowserInformationControl(parent,
-							JFaceResources.DIALOG_FONT, false);
-				}
-			};
-		}
-		return fCreator;
-	}
-
-	public int getPrefixCompletionStart(IDocument document, int completionOffset) {
-		return fBeginInsertPoint;
-	}
-
-	public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
-		return fReplacementString;
-	}
-
-}
\ No newline at end of file

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
deleted file mode 100644
index 6624ce6..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
+++ /dev/null

@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.contentassist;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.CompletionProposal;
-import org.eclipse.jdt.core.CompletionRequestor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.pde.internal.core.util.PDEJavaHelper;
-import org.eclipse.swt.graphics.Image;
-
-public abstract class TypePackageCompletionProcessor implements IContentAssistProcessor {
-
-	private String fErrorMessage;
-	private SearchEngine fSearchEngine;
-	private Comparator fComparator;
-
-	abstract class ProposalGenerator {
-		abstract protected ICompletionProposal generateClassCompletion(String pName, String cName, boolean isClass);
-
-		abstract protected ICompletionProposal generatePackageCompletion(String pName);
-	}
-
-	public TypePackageCompletionProcessor() {
-		fSearchEngine = new SearchEngine();
-	}
-
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-		return null;
-	}
-
-	public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
-		return null;
-	}
-
-	public char[] getCompletionProposalAutoActivationCharacters() {
-		return null;
-	}
-
-	public char[] getContextInformationAutoActivationCharacters() {
-		return null;
-	}
-
-	public IContextInformationValidator getContextInformationValidator() {
-		return null;
-	}
-
-	public String getErrorMessage() {
-		return fErrorMessage;
-	}
-
-	protected void generateTypePackageProposals(String currentContent, IProject project, Collection c, int startOffset, int typeScope) {
-		generateTypePackageProposals(currentContent, project, c, startOffset, typeScope, false);
-	}
-
-	protected void generateTypePackageProposals(String currentContent, IProject project, Collection c, int startOffset, int typeScope, boolean replaceEntireContents) {
-		currentContent = removeLeadingSpaces(currentContent);
-		if (c == null || currentContent.length() == 0)
-			return;
-		int length = (replaceEntireContents) ? -1 : currentContent.length();
-		generateProposals(currentContent, project, c, startOffset, length, typeScope);
-	}
-
-	private void generateProposals(String currentContent, IProject project, final Collection c, final int startOffset, final int length, final int typeScope) {
-
-		class TypePackageCompletionRequestor extends CompletionRequestor {
-
-			public TypePackageCompletionRequestor() {
-				super(true);
-				setIgnored(CompletionProposal.PACKAGE_REF, false);
-				setIgnored(CompletionProposal.TYPE_REF, false);
-			}
-
-			public void accept(CompletionProposal proposal) {
-				ISharedImages images = JavaUI.getSharedImages();
-				if (proposal.getKind() == CompletionProposal.PACKAGE_REF) {
-					String pkgName = new String(proposal.getCompletion());
-					addProposalToCollection(c, startOffset, length, pkgName,
-							pkgName, images
-									.getImage(ISharedImages.IMG_OBJS_PACKAGE));
-				} else {
-					boolean isInterface = Flags.isInterface(proposal.getFlags());
-					String completion = new String(proposal.getCompletion());
-					if (isInterface && typeScope == IJavaSearchConstants.CLASS || (!isInterface && typeScope == IJavaSearchConstants.INTERFACE) || completion.equals("Dummy2")) //$NON-NLS-1$
-						// don't want Dummy class showing up as option.
-						return;
-					int period = completion.lastIndexOf('.');
-					String cName = null, pName = null;
-					if (period == -1) {
-						cName = completion;
-					} else {
-						cName = completion.substring(period + 1);
-						pName = completion.substring(0, period);
-					}
-
-					Image image = isInterface ? images
-							.getImage(ISharedImages.IMG_OBJS_INTERFACE)
-							: images.getImage(ISharedImages.IMG_OBJS_CLASS);
-							addProposalToCollection(c, startOffset, length, cName
-							+ " - " + pName, //$NON-NLS-1$
-							completion, image);
-				}
-			}
-
-		}
-
-		try {
-			ICompilationUnit unit = getWorkingCopy(project);
-			if (unit == null) {
-				generateTypeProposals(currentContent, project, c, startOffset, length, 1);
-				return;
-			}
-			IBuffer buff = unit.getBuffer();
-			buff.setContents("class Dummy2 { " + currentContent); //$NON-NLS-1$
-
-			CompletionRequestor req = new TypePackageCompletionRequestor();
-			unit.codeComplete(15 + currentContent.length(), req);
-			unit.discardWorkingCopy();
-		} catch (JavaModelException e) {
-		}
-	}
-
-	private ICompilationUnit getWorkingCopy(IProject project) throws JavaModelException {
-		IPackageFragmentRoot[] roots = JavaCore.create(project).getPackageFragmentRoots();
-		if (roots.length > 0) {
-			IPackageFragment frag = null;
-			for (int i = 0; i < roots.length; i++)
-				if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE || project.equals(roots[i].getCorrespondingResource()) || (roots[i].isArchive() && !roots[i].isExternal())) {
-					IJavaElement[] elems = roots[i].getChildren();
-					if ((elems.length > 0) && (i < elems.length) && (elems[i] instanceof IPackageFragment)) {
-						frag = (IPackageFragment) elems[i];
-						break;
-					}
-				}
-			if (frag != null)
-				return frag.getCompilationUnit("Dummy2.java").getWorkingCopy(new NullProgressMonitor()); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	protected void generateTypeProposals(String currentContent, IProject project, final Collection c, final int startOffset, final int length, int typeScope) {
-		// Dynamically adjust the search scope depending on the current
-		// state of the project
-		IJavaSearchScope scope = PDEJavaHelper.getSearchScope(project);
-		char[] packageName = null;
-		char[] typeName = null;
-		int index = currentContent.lastIndexOf('.');
-
-		if (index == -1) {
-			// There is no package qualification
-			// Perform the search only on the type name
-			typeName = currentContent.toCharArray();
-		} else if ((index + 1) == currentContent.length()) {
-			// There is a package qualification and the last character is a
-			// dot
-			// Perform the search for all types under the given package
-			// Pattern for all types
-			typeName = "".toCharArray(); //$NON-NLS-1$
-			// Package name without the trailing dot
-			packageName = currentContent.substring(0, index).toCharArray();
-		} else {
-			// There is a package qualification, followed by a dot, and 
-			// a type fragment
-			// Type name without the package qualification
-			typeName = currentContent.substring(index + 1).toCharArray();
-			// Package name without the trailing dot
-			packageName = currentContent.substring(0, index).toCharArray();
-		}
-
-		try {
-			TypeNameRequestor req = new TypeNameRequestor() {
-				public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-					// Accept search results from the JDT SearchEngine
-					String cName = new String(simpleTypeName);
-					String pName = new String(packageName);
-					String label = cName + " - " + pName; //$NON-NLS-1$
-					String content = pName + "." + cName; //$NON-NLS-1$
-					ISharedImages images = JavaUI.getSharedImages();
-					Image image = (Flags.isInterface(modifiers)) ? images
-							.getImage(ISharedImages.IMG_OBJS_INTERFACE)
-							: images.getImage(ISharedImages.IMG_OBJS_CLASS);
-					addProposalToCollection(c, startOffset, length, label, content, image);
-				}
-			};
-			// Note:  Do not use the search() method, its performance is
-			// bad compared to the searchAllTypeNames() method
-			fSearchEngine.searchAllTypeNames(packageName, SearchPattern.R_EXACT_MATCH, typeName, SearchPattern.R_PREFIX_MATCH, typeScope, scope, req, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
-		} catch (CoreException e) {
-			fErrorMessage = e.getMessage();
-		}
-	}
-
-	public void sortCompletions(ICompletionProposal[] proposals) {
-		Arrays.sort(proposals, getComparator());
-	}
-
-	private Comparator getComparator() {
-		if (fComparator == null) {
-			fComparator = new Comparator() {
-				/* (non-Javadoc)
-				 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-				 */
-				public int compare(Object arg0, Object arg1) {
-					ICompletionProposal p1 = (ICompletionProposal) arg0;
-					ICompletionProposal p2 = (ICompletionProposal) arg1;
-
-					return getSortKey(p1).compareToIgnoreCase(getSortKey(p2));
-				}
-
-				protected String getSortKey(ICompletionProposal p) {
-					return p.getDisplayString();
-				}
-			};
-		}
-		return fComparator;
-	}
-
-	protected final String removeLeadingSpaces(String value) {
-		char[] valueArray = value.toCharArray();
-		int i = 0;
-		for (; i < valueArray.length; i++)
-			if (!Character.isWhitespace(valueArray[i]))
-				break;
-		return (i == valueArray.length) ? "" : new String(valueArray, i, valueArray.length - i); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param c
-	 * @param startOffset
-	 * @param length
-	 * @param label
-	 * @param content
-	 * @param image
-	 */
-	protected void addProposalToCollection(final Collection c, final int startOffset, final int length, String label, String content, Image image) {
-		TypeCompletionProposal proposal = new TypeCompletionProposal(content, image, label, startOffset, length);
-		c.add(proposal);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java
deleted file mode 100644
index 92d8542..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertiesDialog.java
+++ /dev/null

@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 244997
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.dialogs;
-
-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.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SWTUtil;
-import org.eclipse.pde.internal.ds.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSPropertiesSection;
-import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ds.ui.wizards.DSNewClassCreationWizard;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.forms.FormDialog;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class DSEditPropertiesDialog extends FormDialog {
-
-	private IDSProperties fProperties;
-	private DSPropertiesSection fPropertiesSection;
-	private FormEntry fEntry;
-
-	public DSEditPropertiesDialog(Shell parentShell,
-			IDSProperties properties, DSPropertiesSection provideSection) {
-		super(parentShell);
-		fProperties = properties;
-		fPropertiesSection = provideSection;
-
-	}
-
-	protected void createFormContent(IManagedForm mform) {
-		mform.getForm().setText(Messages.DSEditPropertiesDialog_dialog_title);
-
-		Composite container = mform.getForm().getBody();
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		FormToolkit toolkit = mform.getToolkit();
-		toolkit.decorateFormHeading(mform.getForm().getForm());
-
-		Composite entryContainer = toolkit.createComposite(container);
-		entryContainer.setLayout(FormLayoutFactory
-				.createSectionClientGridLayout(false, 3));
-		entryContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-
-		// Attribute: title
-		fEntry = new FormEntry(entryContainer, toolkit,
-				Messages.DSPropertiesDetails_entry,
-				Messages.DSPropertiesDetails_browse, false, 0);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 20;
-		gd.horizontalSpan = 2;
-		gd.horizontalIndent = 3; // FormLayoutFactory.CONTROL_HORIZONTAL_INDENT
-
-		toolkit.paintBordersFor(entryContainer);
-		updateFields();
-
-		setEntryListeners();
-	}
-
-	public boolean isHelpAvailable() {
-		return false;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-		case 0:
-			handleOKPressed();
-			break;
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	private void handleOKPressed() {
-		fEntry.commit();
-		if (!(fEntry.getValue().equals("") && fProperties.getEntry() == null)) { //$NON-NLS-1$
-			if (!fEntry.getValue().equals(fProperties.getEntry())) {
-				fProperties.setEntry(fEntry.getValue());
-			}
-		}
-
-	}
-
-	private void updateFields() {
-		if (fProperties == null) {
-			return;
-		}
-
-		if (fProperties.getEntry() == null) {
-			fEntry.setValue(""); //$NON-NLS-1$
-		} else {
-			// Attribute: Interface
-			fEntry.setValue(fProperties.getEntry(), true);
-		}
-		fEntry.setEditable(true);
-
-	}
-
-	public void setEntryListeners() {
-		// Attribute: Interface
-		fEntry.setFormEntryListener(new FormEntryAdapter(
-				this.fPropertiesSection) {
-			public void textValueChanged(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void textDirty(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				String value = fEntry.getValue();
-				value = handleLinkActivated(value, false);
-				if (value != null)
-					fEntry.setValue(value);
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				doOpenSelectionDialog(fEntry);
-			}
-
-		});
-
-	}
-
-	private String handleLinkActivated(String value, boolean isInter) {
-		IProject project = getProject();
-		try {
-			if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement element = javaProject.findType(value.replace('$',
-						'.'));
-				if (element != null)
-					JavaUI.openInEditor(element);
-				else {
-					// TODO create our own wizard for reuse here
-					DSNewClassCreationWizard wizard = new DSNewClassCreationWizard(
-							project, isInter, value);
-					WizardDialog dialog = new WizardDialog(Activator
-							.getActiveWorkbenchShell(), wizard);
-					dialog.create();
-					SWTUtil.setDialogSize(dialog, 400, 500);
-					if (dialog.open() == Window.OK) {
-						return wizard.getQualifiedName();
-					}
-				}
-			}
-		} catch (PartInitException e1) {
-		} catch (CoreException e1) {
-		}
-		return null;
-	}
-
-	private IProject getProject() {
-		PDEFormEditor editor = (PDEFormEditor) this.fPropertiesSection
-				.getPage().getEditor();
-		return editor.getCommonProject();
-	}
-
-	private void doOpenSelectionDialog(FormEntry entry) {
-		final IProject project = getProject();
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
-				Activator.getActiveWorkbenchShell(),
-				new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		dialog.setInput(project.getWorkspace());
-		IResource resource = getFile();
-		if (resource != null)
-			dialog.setInitialSelection(resource);
-		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(Messages.DSPropertiesDetails_dialogTitle);
-		dialog.setMessage(Messages.DSPropertiesDetails_dialogMessage);
-		dialog.setValidator(new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection != null
-						&& selection.length > 0
-						&& (selection[0] instanceof IFile || selection[0] instanceof IContainer))
-					return new Status(IStatus.OK, Activator.PLUGIN_ID,
-							IStatus.OK, "", null); //$NON-NLS-1$
-
-				return new Status(IStatus.ERROR, Activator.PLUGIN_ID,
-						IStatus.ERROR, "", null); //$NON-NLS-1$
-			}
-		});
-		if (dialog.open() == Window.OK) {
-			IResource res = (IResource) dialog.getFirstResult();
-			IPath path = res.getProjectRelativePath();
-			if (res instanceof IContainer)
-				path = path.addTrailingSeparator();
-			String value = path.toString();
-			fEntry.setValue(value);
-		}
-	}
-
-	private IResource getFile() {
-		String value = fEntry.getValue();
-		if (value.length() == 0)
-			return null;
-		IProject project = getProject();
-		IPath path = project.getFullPath().append(value);
-		return project.getWorkspace().getRoot().findMember(path);
-	}
-	
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java
deleted file mode 100644
index 3a97f2b..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditPropertyDialog.java
+++ /dev/null

@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 244997
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.dialogs;
-
-import java.util.StringTokenizer;
-
-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.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SWTUtil;
-import org.eclipse.pde.internal.ds.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSPropertiesSection;
-import org.eclipse.pde.internal.ds.ui.parts.ComboPart;
-import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ds.ui.wizards.DSNewClassCreationWizard;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-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.Shell;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.forms.FormDialog;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class DSEditPropertyDialog extends FormDialog {
-
-	private IDSProperty fProperty;
-	private DSPropertiesSection fPropertiesSection;
-	private FormEntry fNameEntry;
-	private ComboPart fTypeCombo;
-	private FormEntry fValuesEntry;
-	private boolean fAddDialog; // boolean used to erase added element whether
-
-	private static final String EMPTY = ""; //$NON-NLS-1$
-
-	public DSEditPropertyDialog(Shell parentShell, IDSProperty property,
-			DSPropertiesSection propertiesSection, boolean addDialog) {
-		super(parentShell);
-		fProperty = property;
-		fPropertiesSection = propertiesSection;
-		fAddDialog = addDialog;
-
-	}
-
-	protected void createFormContent(IManagedForm mform) {
-		mform.getForm().setText(Messages.DSEditPropertyDialog_dialog_title);
-
-		Composite container = mform.getForm().getBody();
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		FormToolkit toolkit = mform.getToolkit();
-		toolkit.decorateFormHeading(mform.getForm().getForm());
-
-		Composite mainContainer = toolkit.createComposite(container);
-		mainContainer.setLayout(FormLayoutFactory
-				.createSectionClientGridLayout(false, 2));
-		mainContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Attribute: name
-		fNameEntry = new FormEntry(mainContainer, toolkit,
-				Messages.DSPropertyDetails_nameEntry, SWT.MULTI);
-
-		// Attribute: type
-		toolkit.createLabel(mainContainer,
-				Messages.DSPropertyDetails_typeEntry, SWT.WRAP);
-		fTypeCombo = new ComboPart();
-		fTypeCombo.createControl(mainContainer, toolkit, SWT.READ_ONLY);
-
-		String[] itemsCard = new String[] {
-				IDSConstants.VALUE_PROPERTY_TYPE_BOOLEAN,
-				IDSConstants.VALUE_PROPERTY_TYPE_BYTE,
-				IDSConstants.VALUE_PROPERTY_TYPE_CHAR,
-				IDSConstants.VALUE_PROPERTY_TYPE_DOUBLE,
-				IDSConstants.VALUE_PROPERTY_TYPE_FLOAT,
-				IDSConstants.VALUE_PROPERTY_TYPE_INTEGER,
-				IDSConstants.VALUE_PROPERTY_TYPE_LONG,
-				IDSConstants.VALUE_PROPERTY_TYPE_SHORT,
-				IDSConstants.VALUE_PROPERTY_TYPE_STRING };
-		fTypeCombo.setItems(itemsCard);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalIndent = 3;
-		fTypeCombo.getControl().setLayoutData(data);
-
-		// description: Content (Element)
-		fValuesEntry = new FormEntry(mainContainer, toolkit,
-				Messages.DSEditPropertyDialog_valuesLabel, SWT.MULTI
-						| SWT.V_SCROLL);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.heightHint = 60;
-		data.horizontalIndent = 4;
-		fValuesEntry.getText().setLayoutData(data);
-
-		updateFields();
-
-		setEntryListeners();
-
-		toolkit.paintBordersFor(mainContainer);
-
-	}
-
-	public boolean isHelpAvailable() {
-		return false;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-		case 0:
-			handleOKPressed();
-			break;
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	private void handleOKPressed() {
-		fNameEntry.commit();
-		if (!(fNameEntry.getValue().equals("") && fProperty.getPropertyName() == null)) { //$NON-NLS-1$
-			if (!fNameEntry.getValue().equals(fProperty.getPropertyName())) {
-				fProperty.setPropertyName(fNameEntry.getValue());
-			}
-		}
-
-		String typeSelection = fTypeCombo.getSelection();
-		if (typeSelection != null) {
-			if (!typeSelection.equals("")) { //$NON-NLS-1$
-				if (!typeSelection.equals(fProperty.getPropertyType())) {
-					fProperty.setPropertyType(typeSelection);
-				}
-			}
-		}
-
-		fValuesEntry.commit();
-		StringTokenizer lines = new StringTokenizer(fValuesEntry.getValue(),
-				"\n"); //$NON-NLS-1$
-			
-		if (lines.countTokens() == 1) {
-			if (!(fValuesEntry.getValue().equals("") && fProperty.getPropertyValue() == null)) //$NON-NLS-1$
-				handleUniqueValue();
-		} else if (lines.countTokens() > 1) {
-			if (!(fValuesEntry.getValue().equals("") && fProperty.getPropertyElemBody() == null)) //$NON-NLS-1$
-				handleBodyValues();
-		}
-
-		if (fAddDialog) {
-			fProperty.getModel().getDSComponent().addPropertyElement(fProperty);
-		}
-	}
-
-	private void handleUniqueValue() {
-		if (!fValuesEntry.getValue().equals(fProperty.getPropertyValue())) {
-			fProperty.setPropertyValue(fValuesEntry.getValue());
-		}
-		// Erase Body values if needed.
-		if (fProperty.getPropertyElemBody() != null
-				&& !fProperty.getPropertyElemBody().equals(EMPTY)) {
-			fProperty.setPropertyElemBody(EMPTY);
-		}
-	}
-
-	private void handleBodyValues() {
-		String propertyElemBody = fProperty.getPropertyElemBody();
-		if (propertyElemBody != null) {
-			propertyElemBody = EMPTY;
-		}
-		if (!fValuesEntry.getValue().equals(propertyElemBody)) {
-			fProperty.setPropertyElemBody(fValuesEntry.getValue());
-		}
-		// Erase property value attribute if needed.
-		if (fProperty.getPropertyValue() != null
-				&& !fProperty.getPropertyValue().equals(EMPTY)) {
-			fProperty.setPropertyValue(EMPTY);
-		}
-		
-	}
-
-	public void updateFields() {
-
-		// Ensure data object is defined
-		if (fProperty == null) {
-			return;
-		}
-		// Attribute: name
-		if (fProperty.getPropertyName() != null) {
-			fNameEntry.setValue(fProperty.getPropertyName(), true);
-		} else {
-			fNameEntry.setValue("", true); //$NON-NLS-1$
-		}
-		fNameEntry.setEditable(true);
-
-		// Attribute: value
-		if (fProperty.getPropertyValue() != null
-				&& !fProperty.getPropertyValue().equals(EMPTY)) {
-			fValuesEntry.setValue(fProperty.getPropertyValue(), true);
-		} else {
-			// Attribute: body
-			if (fProperty.getPropertyElemBody() != null) {
-				fValuesEntry.setValue(fProperty.getPropertyElemBody(), true);
-			} else {
-				fValuesEntry.setValue(EMPTY, true);
-			}
-		}
-		fValuesEntry.setEditable(true);
-
-		// Attribute: type
-		if (fProperty.getPropertyType() != null)
-			fTypeCombo.setText(fProperty.getPropertyType());
-
-		
-	}
-
-	public void setEntryListeners() {
-		// Attribute: Name
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(
-				this.fPropertiesSection) {
-			public void textValueChanged(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void textDirty(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				String value = fNameEntry.getValue();
-				value = handleLinkActivated(value, false);
-				if (value != null)
-					fNameEntry.setValue(value);
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				doOpenSelectionDialog(fNameEntry);
-			}
-
-		});
-
-
-		// Attribute: Values
-		fValuesEntry.setFormEntryListener(new FormEntryAdapter(
-				this.fPropertiesSection) {
-			public void textValueChanged(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void textDirty(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-		});
-
-	}
-
-	private String handleLinkActivated(String value, boolean isInter) {
-		IProject project = getProject();
-		try {
-			if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement element = javaProject.findType(value.replace('$',
-						'.'));
-				if (element != null)
-					JavaUI.openInEditor(element);
-				else {
-					DSNewClassCreationWizard wizard = new DSNewClassCreationWizard(
-							project, isInter, value);
-					WizardDialog dialog = new WizardDialog(Activator
-							.getActiveWorkbenchShell(), wizard);
-					dialog.create();
-					SWTUtil.setDialogSize(dialog, 400, 500);
-					if (dialog.open() == Window.OK) {
-						return wizard.getQualifiedName();
-					}
-				}
-			}
-		} catch (PartInitException e1) {
-		} catch (CoreException e1) {
-		}
-		return null;
-	}
-
-	private IProject getProject() {
-		PDEFormEditor editor = (PDEFormEditor) this.fPropertiesSection
-				.getPage().getEditor();
-		return editor.getCommonProject();
-	}
-
-	private void doOpenSelectionDialog(FormEntry entry) {
-		final IProject project = getProject();
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
-				Activator.getActiveWorkbenchShell(),
-				new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		dialog.setInput(project.getWorkspace());
-		IResource resource = getFile(entry);
-		if (resource != null)
-			dialog.setInitialSelection(resource);
-		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(Messages.DSEditPropertyDialog_dialog_title);
-		dialog.setMessage(Messages.DSEditPropertyDialog_dialogMessage);
-		dialog.setValidator(new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection != null
-						&& selection.length > 0
-						&& (selection[0] instanceof IFile || selection[0] instanceof IContainer))
-					return new Status(IStatus.OK, Activator.PLUGIN_ID,
-							IStatus.OK, "", null); //$NON-NLS-1$
-
-				return new Status(IStatus.ERROR, Activator.PLUGIN_ID,
-						IStatus.ERROR, "", null); //$NON-NLS-1$
-			}
-		});
-		if (dialog.open() == Window.OK) {
-			IResource res = (IResource) dialog.getFirstResult();
-			IPath path = res.getProjectRelativePath();
-			if (res instanceof IContainer)
-				path = path.addTrailingSeparator();
-			String value = path.toString();
-			entry.setValue(value);
-		}
-	}
-
-	private IResource getFile(FormEntry entry) {
-		String value = entry.getValue();
-		if (value.length() == 0)
-			return null;
-		IProject project = getProject();
-		IPath path = project.getFullPath().append(value);
-		return project.getWorkspace().getRoot().findMember(path);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java
deleted file mode 100644
index ec7c05a..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditProvideDialog.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ds.ui.editor.dialogs;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SWTUtil;
-import org.eclipse.pde.internal.ds.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSProvideSection;
-import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ds.ui.wizards.DSNewClassCreationWizard;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.forms.FormDialog;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class DSEditProvideDialog extends FormDialog {
-
-	private IDSProvide fProvide;
-	private FormEntry fInterfaceEntry;
-	private DSProvideSection fProvideSection;
-
-	public DSEditProvideDialog(Shell parentShell, IDSProvide provide,
-			DSProvideSection provideSection) {
-		super(parentShell);
-		fProvide = provide;
-		fProvideSection = provideSection;
-
-	}
-	
-	protected void createFormContent(IManagedForm mform) {
-		mform.getForm().setText(Messages.DSEditProvideDialog_dialog_title);
-		
-		Composite container = mform.getForm().getBody();
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		FormToolkit toolkit = mform.getToolkit();
-		toolkit.decorateFormHeading(mform.getForm().getForm());
-
-		Composite composite = toolkit.createComposite(container);
-		composite.setLayout(FormLayoutFactory
-				.createSectionClientGridLayout(
-				false, 3));
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		// Attribute: Interface
-		fInterfaceEntry = new FormEntry(composite, toolkit,
-				Messages.DSProvideDetails_interface,
-				Messages.DSProvideDetails_browse, false, 0);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 20;
-		gd.horizontalSpan = 2;
-		gd.horizontalIndent = 3; // FormLayoutFactory.CONTROL_HORIZONTAL_INDENT
-
-		// Bind widgets
-		toolkit.paintBordersFor(composite);
-		updateFields();
-
-		setInterfaceEntryListeners();
-	}
-
-	public boolean isHelpAvailable() {
-		return false;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-		case 0:
-			handleOKPressed();
-			break;
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	private void handleOKPressed() {
-		fInterfaceEntry.commit();
-		if (!(fInterfaceEntry.getValue().equals("") && fProvide.getInterface() == null)) { //$NON-NLS-1$
-			if (!fInterfaceEntry.getValue().equals(
-					fProvide.getInterface())) {
-				fProvide.setInterface(fInterfaceEntry.getValue());
-			}
-		}
-
-	}
-
-	private void updateFields() {
-		if (fProvide == null) {
-			return;
-		}
-
-
-		if (fProvide.getInterface() == null) {
-			fInterfaceEntry.setValue(""); //$NON-NLS-1$
-		} else {
-			// Attribute: Interface
-			fInterfaceEntry.setValue(fProvide.getInterface(), true);
-		}
-		fInterfaceEntry.setEditable(true);
-
-	}
-
-	public void setInterfaceEntryListeners() {
-		// Attribute: Interface
-		fInterfaceEntry.setFormEntryListener(new FormEntryAdapter(
-				this.fProvideSection) {
-			public void textValueChanged(FormEntry entry) {
-				// no op due to OK Button
-			}
-			
-			public void textDirty(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				String value = fInterfaceEntry.getValue();
-				value = handleLinkActivated(value, false);
-				if (value != null)
-					fInterfaceEntry.setValue(value);
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				doOpenSelectionDialog(
-						IJavaElementSearchConstants.CONSIDER_CLASSES_AND_INTERFACES,
-						fInterfaceEntry);
-			}
-
-		});
-
-	}
-
-	private String handleLinkActivated(String value, boolean isInter) {
-		IProject project = getProject();
-		try {
-			if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement element = javaProject.findType(value.replace('$',
-						'.'));
-				if (element != null)
-					JavaUI.openInEditor(element);
-				else {
-					// TODO create our own wizard for reuse here
-					DSNewClassCreationWizard wizard = new DSNewClassCreationWizard(
-							project, isInter, value);
-					WizardDialog dialog = new WizardDialog(Activator
-							.getActiveWorkbenchShell(), wizard);
-					dialog.create();
-					SWTUtil.setDialogSize(dialog, 400, 500);
-					if (dialog.open() == Window.OK) {
-						return wizard.getQualifiedName();
-					}
-				}
-			}
-		} catch (PartInitException e1) {
-		} catch (CoreException e1) {
-		}
-		return null;
-	}
-
-	private IProject getProject() {
-		PDEFormEditor editor = (PDEFormEditor) this.fProvideSection.getPage()
-				.getEditor();
-		return editor.getCommonProject();
-	}
-
-	private void doOpenSelectionDialog(int scopeType, FormEntry entry) {
-		try {
-			String filter = entry.getValue();
-			filter = filter.substring(filter.lastIndexOf(".") + 1); //$NON-NLS-1$
-			SelectionDialog dialog = JavaUI.createTypeDialog(Activator
-					.getActiveWorkbenchShell(), PlatformUI.getWorkbench()
-					.getProgressService(), SearchEngine.createWorkspaceScope(),
-					scopeType, false, filter);
-			dialog.setTitle(Messages.DSProvideDetails_selectType);
-			if (dialog.open() == Window.OK) {
-				IType type = (IType) dialog.getResult()[0];
-				entry.setValue(type.getFullyQualifiedName('$'));
-				entry.commit();
-			}
-		} catch (CoreException e) {
-		}
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java
deleted file mode 100644
index 635977b..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/dialogs/DSEditReferenceDialog.java
+++ /dev/null

@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ds.ui.editor.dialogs;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SWTUtil;
-import org.eclipse.pde.internal.ds.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.editor.sections.DSReferenceSection;
-import org.eclipse.pde.internal.ds.ui.parts.ComboPart;
-import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ds.ui.wizards.DSNewClassCreationWizard;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-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.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.forms.FormDialog;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class DSEditReferenceDialog extends FormDialog {
-
-	private IDSReference fReference;
-	private FormEntry fNameEntry;
-	private FormEntry fInterfaceEntry;
-	private FormEntry fBindEntry;
-	private FormEntry fUnBindEntry;
-	private FormEntry fTargetEntry;
-	private ComboPart fCardinality;
-	private Label fLabelCardinality;
-	private ComboPart fPolicy;
-	private Label fLabelPolicy;
-	private DSReferenceSection fReferenceSection;
-
-	public DSEditReferenceDialog(Shell parentShell, IDSReference reference,
-			DSReferenceSection referenceSection) {
-		super(parentShell);
-		fReference = reference;
-		fReferenceSection = referenceSection;
-	}
-
-	protected void createFormContent(IManagedForm mform) {
-		mform.getForm().setText(Messages.DSEditReferenceDialog_dialog_title);
-
-		Composite container = mform.getForm().getBody();
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		FormToolkit toolkit = mform.getToolkit();
-		toolkit.decorateFormHeading(mform.getForm().getForm());
-
-		Composite entryContainer = toolkit.createComposite(container);
-		entryContainer.setLayout(FormLayoutFactory.createSectionClientGridLayout(
-				false, 3));
-		entryContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Attribute: name
-		fNameEntry = new FormEntry(entryContainer, toolkit,
-				Messages.DSReferenceDetails_nameEntry, SWT.NONE);
-
-		// Attribute: Interface
-		fInterfaceEntry = new FormEntry(entryContainer, toolkit,
-				Messages.DSReferenceDetails_interfaceEntry,
-				Messages.DSReferenceDetails_browse, false, 0);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		gd.horizontalIndent = 3;
-
-		// Attribute: Cardinality
-		addCardinalityEntry(toolkit, entryContainer, gd);
-
-		// Attribute: Policy
-		addPolicyEntry(toolkit, entryContainer, gd);
-
-		// Attribute: Target
-		fTargetEntry = new FormEntry(entryContainer, toolkit,
-				Messages.DSReferenceDetails_targetEntry, SWT.NONE);
-
-		// Attribute: Bind
-		fBindEntry = new FormEntry(entryContainer, toolkit,
-				Messages.DSReferenceDetails_bindEntry, SWT.NONE);
-
-		// Attribute: UnBind
-		fUnBindEntry = new FormEntry(entryContainer, toolkit,
-				Messages.DSReferenceDetails_unbindEntry, SWT.NONE);
-
-		// Update Fields with fReference`s attributes values
-		toolkit.paintBordersFor(entryContainer);
-		updateFields();
-
-		setInterfaceEntryListeners();
-		toolkit.paintBordersFor(entryContainer);
-	}
-
-
-	private void addCardinalityEntry(FormToolkit toolkit, Composite container3,
-			GridData gd) {
-		fLabelCardinality = toolkit.createLabel(container3,
-				Messages.DSReferenceDetails_cardinalityLabel, SWT.WRAP);
-		fLabelCardinality.setForeground(toolkit.getColors().getForeground());
-		fCardinality = new ComboPart();
-		fCardinality.createControl(container3, toolkit, SWT.READ_ONLY);
-
-		String[] itemsCard = new String[] {
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_ONE,
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ZERO_N,
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_ONE,
-				IDSConstants.VALUE_REFERENCE_CARDINALITY_ONE_N };
-		fCardinality.setItems(itemsCard);
-		fCardinality.getControl().setLayoutData(gd);
-	}
-
-	private void addPolicyEntry(FormToolkit toolkit, Composite container3,
-			GridData gd) {
-		fLabelPolicy = toolkit.createLabel(container3,
-				Messages.DSReferenceDetails_policeLabel, SWT.WRAP);
-		fLabelPolicy.setForeground(toolkit.getColors().getForeground());
-		fPolicy = new ComboPart();
-		fPolicy.createControl(container3, toolkit, SWT.READ_ONLY);
-		String[] itemsPolicy = new String[] {
-				IDSConstants.VALUE_REFERENCE_POLICY_STATIC,
-				IDSConstants.VALUE_REFERENCE_POLICY_DYNAMIC };
-		fPolicy.setItems(itemsPolicy);
-		fPolicy.getControl().setLayoutData(gd);
-	}
-
-	public boolean isHelpAvailable() {
-		return false;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-		case 0:
-			handleOKPressed();
-			break;
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	private void handleOKPressed() {
-		fNameEntry.commit();
-		if (!(fNameEntry.getValue().equals("") && fReference.getReferenceName() == null)) { //$NON-NLS-1$
-			if (!fNameEntry.getValue().equals(fReference.getReferenceName())) {
-				fReference.setReferenceName(fNameEntry.getValue());
-			}
-		}
-
-		fInterfaceEntry.commit();
-		if (!(fInterfaceEntry.getValue().equals("") && fReference.getReferenceInterface() == null)) { //$NON-NLS-1$
-			if (!fInterfaceEntry.getValue().equals(
-					fReference.getReferenceInterface())) {
-				fReference.setReferenceInterface(fInterfaceEntry.getValue());
-			}
-		}
-
-		fBindEntry.commit();
-		if (!(fBindEntry.getValue().equals("") && fReference.getReferenceBind() == null)) { //$NON-NLS-1$
-			if (!fBindEntry.getValue().equals(fReference.getReferenceBind())) {
-				fReference.setReferenceBind(fBindEntry.getValue());
-			}
-		}
-
-
-		fUnBindEntry.commit();
-		if (!(fUnBindEntry.getValue().equals("") && fReference.getReferenceUnbind() == null)) { //$NON-NLS-1$
-			if (!fUnBindEntry.getValue()
-					.equals(fReference.getReferenceUnbind())) {
-				fReference.setReferenceUnbind(fUnBindEntry.getValue());
-			}
-		}
-
-		fTargetEntry.commit();
-		if ( !(fTargetEntry.getValue().equals("") && fReference.getReferenceTarget() == null)) { //$NON-NLS-1$
-			if (!fTargetEntry.getValue().equals(fReference.getReferenceTarget())) {
-				fReference.setReferenceTarget(fTargetEntry.getValue());
-			}
-		}
-
-		if (fCardinality.getSelection() != null) {
-			if (!fCardinality.getSelection().equals(
-					fReference.getReferenceCardinality())) {
-				fReference.setReferenceCardinality(fCardinality.getSelection());
-			}
-		}
-
-		if (fPolicy.getSelection() != null) {
-			if (!fPolicy.getSelection().equals(fReference.getReferencePolicy())) {
-				fReference.setReferencePolicy(fPolicy.getSelection());
-			}
-		}
-	}
-
-	private void updateFields() {
-		if (fReference == null) {
-			return;
-		}
-
-		if (fReference.getReferenceName() == null) {
-			fNameEntry.setValue(""); //$NON-NLS-1$
-		} else {
-			// Attribute: name
-			fNameEntry.setValue(fReference.getReferenceName(), true);
-		}
-		fNameEntry.setEditable(true);
-
-		if (fReference.getReferenceInterface() == null) {
-			fInterfaceEntry.setValue(""); //$NON-NLS-1$
-		} else {
-			// Attribute: Interface
-			fInterfaceEntry.setValue(fReference.getReferenceInterface(), true);
-		}
-		fInterfaceEntry.setEditable(true);
-
-		// Attribute: Target
-		fTargetEntry.setValue(fReference.getReferenceTarget(), true);
-		fTargetEntry.setEditable(true);
-
-		// Attribute: Bind
-		fBindEntry.setValue(fReference.getReferenceBind(), true);
-		fBindEntry.setEditable(true);
-
-		// Attribute: Unbind
-		fUnBindEntry.setValue(fReference.getReferenceUnbind(), true);
-		fUnBindEntry.setEditable(true);
-
-		// Attribute: Cardinality
-		if (fReference.getReferenceCardinality() != null)
-			fCardinality.setText(fReference.getReferenceCardinality());
-
-		// Attribute: Policy
-		if (fReference.getReferencePolicy() != null)
-			fPolicy.setText(fReference.getReferencePolicy());
-
-	}
-
-	public void setInterfaceEntryListeners() {
-		// Attribute: Interface
-		fInterfaceEntry.setFormEntryListener(new FormEntryAdapter(
-				this.fReferenceSection) {
-			public void textValueChanged(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void textDirty(FormEntry entry) {
-				// no op due to OK Button
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				String value = fInterfaceEntry.getValue();
-				value = handleLinkActivated(value, false);
-				if (value != null)
-					fInterfaceEntry.setValue(value);
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				doOpenSelectionDialog(
-						IJavaElementSearchConstants.CONSIDER_CLASSES_AND_INTERFACES,
-						fInterfaceEntry);
-			}
-
-		});
-
-	}
-
-	private String handleLinkActivated(String value, boolean isInter) {
-		IProject project = getProject();
-		try {
-			if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement element = javaProject.findType(value.replace('$',
-						'.'));
-				if (element != null)
-					JavaUI.openInEditor(element);
-				else {
-					// TODO create our own wizard for reuse here
-					DSNewClassCreationWizard wizard = new DSNewClassCreationWizard(
-							project, isInter, value);
-					WizardDialog dialog = new WizardDialog(Activator
-							.getActiveWorkbenchShell(), wizard);
-					dialog.create();
-					SWTUtil.setDialogSize(dialog, 400, 500);
-					if (dialog.open() == Window.OK) {
-						return wizard.getQualifiedName();
-					}
-				}
-			}
-		} catch (PartInitException e1) {
-		} catch (CoreException e1) {
-		}
-		return null;
-	}
-
-	private IProject getProject() {
-		PDEFormEditor editor = (PDEFormEditor) this.fReferenceSection.getPage()
-				.getEditor();
-		return editor.getCommonProject();
-	}
-
-	private void doOpenSelectionDialog(int scopeType, FormEntry entry) {
-		try {
-			String filter = entry.getValue();
-			filter = filter.substring(filter.lastIndexOf(".") + 1); //$NON-NLS-1$
-			SelectionDialog dialog = JavaUI.createTypeDialog(Activator
-					.getActiveWorkbenchShell(), PlatformUI.getWorkbench()
-					.getProgressService(), SearchEngine.createWorkspaceScope(),
-					scopeType, false, filter);
-			dialog.setTitle(Messages.DSReferenceDetails_selectType);
-			if (dialog.open() == Window.OK) {
-				IType type = (IType) dialog.getResult()[0];
-				entry.setValue(type.getFullyQualifiedName('$'));
-				entry.commit();
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java
deleted file mode 100644
index 0d1c734..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028, 249263
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 254971
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.sections;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SWTUtil;
-import org.eclipse.pde.internal.ds.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ds.ui.wizards.DSNewClassCreationWizard;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.util.PDEJavaHelperUI;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class DSComponentSection extends PDESection {
-
-	private IDSComponent fComponent;
-	private IDSImplementation fImplementation;
-	private FormEntry fClassEntry;
-	private FormEntry fNameEntry;
-	private FormEntry fActivateEntry;
-	private FormEntry fDeactivateEntry;
-	private FormEntry fModifiedEntry;
-	private IDSModel fModel;
-
-	public DSComponentSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	protected void createClient(Section section, FormToolkit toolkit) {
-
-		initializeAttributes();
-
-		section.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		section.setLayoutData(data);
-		section.setText(Messages.DSSection_title);
-		section.setDescription(Messages.DSSection_description);
-
-		Composite client = toolkit.createComposite(section);
-		client.setLayout(new GridLayout(3, false));
-		client.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// Attribute: name
-		fNameEntry = new FormEntry(client, toolkit,
-				Messages.DSComponentDetails_nameEntry, SWT.NONE);
-
-		// Attribute: class
-		fClassEntry = new FormEntry(client, toolkit,
-				Messages.DSImplementationDetails_classEntry,
-				Messages.DSImplementationDetails_browse, isEditable(), 0);
-
-		// Attribute: activate
-		fActivateEntry = new FormEntry(client, toolkit,
-				Messages.DSComponentDetails_activateEntry, SWT.NONE);
-		fActivateEntry.getLabel().setToolTipText(
-				Messages.DSComponentDetails_activateTooltip);
-
-		// Attribute: deactivate
-		fDeactivateEntry = new FormEntry(client, toolkit,
-				Messages.DSComponentDetails_deactivateEntry, SWT.NONE);
-		fDeactivateEntry.getLabel().setToolTipText(
-				Messages.DSComponentDetails_deactivateTooltip);
-		
-		// Attribute: modified
-		fModifiedEntry = new FormEntry(client, toolkit,
-				Messages.DSComponentDetails_modifiedEntry, SWT.NONE);
-		fModifiedEntry.getLabel().setToolTipText(
-				Messages.DSComponentDetails_modifiedTooltip);
-
-		setListeners();
-		updateUIFields();
-
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-
-	}
-
-	private void initializeAttributes() {
-		fModel = (IDSModel) getPage().getModel();
-		fModel.addModelChangedListener(this);
-
-		fComponent = fModel.getDSComponent();
-		if (fComponent != null) {
-			fImplementation = fComponent.getImplementation();
-		}
-	}
-
-	public void commit(boolean onSave) {
-		fClassEntry.commit();
-		fNameEntry.commit();
-		fActivateEntry.commit();
-		fDeactivateEntry.commit();
-		fModifiedEntry.commit();
-		super.commit(onSave);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		fComponent = fModel.getDSComponent();
-		if (fComponent != null)
-			fImplementation = fComponent.getImplementation();
-
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-
-		if (fNameEntry != null) {
-			Display.getDefault().syncExec(new Runnable() {
-				public void run() {
-					updateUIFields();
-				}
-			});
-		}
-
-	}
-
-	public void updateUIFields() {
-
-		if (fComponent != null) {
-			if (fComponent.getAttributeName() == null) {
-				// Attribute: name
-				fNameEntry.setValue("", true); //$NON-NLS-1$
-			} else {
-				// Attribute: name
-				fNameEntry.setValue(fComponent.getAttributeName(), true);
-			}
-			fNameEntry.setEditable(isEditable());
-
-			if (fComponent.getActivateMethod() == null) {
-				fActivateEntry.setValue("", true); //$NON-NLS-1$
-			} else {
-				fActivateEntry.setValue(fComponent.getActivateMethod(), true);
-			}
-
-			fActivateEntry.setEditable(isEditable());
-
-			if (fComponent.getDeactivateMethod() == null) {
-				fDeactivateEntry.setValue("", true); //$NON-NLS-1$
-			} else {
-				fDeactivateEntry.setValue(fComponent.getDeactivateMethod(),
-						true);
-			}
-			fDeactivateEntry.setEditable(isEditable());
-
-			if (fComponent.getModifiedMethod() == null) {
-				fModifiedEntry.setValue("", true); //$NON-NLS-1$
-			} else {
-				fModifiedEntry.setValue(fComponent.getModifiedMethod(), true);
-			}
-			fModifiedEntry.setEditable(isEditable());
-		}
-
-		// Ensure data object is defined
-		if (fImplementation != null) {
-			if (fImplementation.getClassName() == null) {
-				fClassEntry.setValue("", true); //$NON-NLS-1$
-			} else {
-				// Attribute: title
-				fClassEntry.setValue(fImplementation.getClassName(), true);
-
-			}
-			fClassEntry.setEditable(isEditable());
-		}
-
-	}
-
-	public void setListeners() {
-		// Attribute: name
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fComponent == null) {
-					return;
-				}
-				fComponent.setAttributeName(fNameEntry.getValue());
-			}
-		});
-		fActivateEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fComponent == null) {
-					return;
-				}
-				fComponent.setActivateMethod(fActivateEntry.getValue());
-			}
-		});
-		fDeactivateEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fComponent == null) {
-					return;
-				}
-				fComponent.setDeactivateMethod(fDeactivateEntry.getValue());
-			}
-		});
-		fModifiedEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fComponent == null) {
-					return;
-				}
-				fComponent.setModifiedeMethod(fModifiedEntry.getValue());
-			}
-		});
-
-		IActionBars actionBars = this.getPage().getEditor().getEditorSite()
-				.getActionBars();
-		// Attribute: class
-		fClassEntry
-				.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-					public void textValueChanged(FormEntry entry) {
-						if (fImplementation == null) {
-							if (fComponent != null) {
-								fImplementation = fComponent.getModel()
-										.getFactory().createImplementation();
-								fImplementation.setClassName(fClassEntry
-										.getValue());
-								fComponent.addChildNode(fImplementation, 0,
-										true);
-							}
-						} else {
-							fImplementation
-									.setClassName(fClassEntry.getValue());
-						}
-					}
-
-					public void linkActivated(HyperlinkEvent e) {
-						String value = fClassEntry.getValue();
-						value = handleLinkActivated(value, false);
-						if (value != null)
-							fClassEntry.setValue(value);
-					}
-
-					public void browseButtonSelected(FormEntry entry) {
-						doOpenSelectionDialog(
-								fClassEntry);
-					}
-
-				});
-	}
-
-	private String handleLinkActivated(String value, boolean isInter) {
-		IProject project = getProject();
-		try {
-			if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement element = javaProject.findType(value.replace('$',
-						'.'));
-				if (element != null)
-					JavaUI.openInEditor(element);
-				else {
-					// TODO create our own wizard for reuse here
-					DSNewClassCreationWizard wizard = new DSNewClassCreationWizard(
-							project, isInter, value);
-					WizardDialog dialog = new WizardDialog(Activator
-							.getActiveWorkbenchShell(), wizard);
-					dialog.create();
-					SWTUtil.setDialogSize(dialog, 400, 500);
-					if (dialog.open() == Window.OK) {
-						return wizard.getQualifiedName();
-					}
-				}
-			}
-		} catch (PartInitException e1) {
-		} catch (CoreException e1) {
-		}
-		return null;
-	}
-
-	private void doOpenSelectionDialog(FormEntry entry) {
-		String filter = entry.getValue();
-		if (filter.length() == 0)
-			filter = "**"; //$NON-NLS-1$
-		else
-			filter = filter.substring(filter.lastIndexOf(".") + 1); //$NON-NLS-1$
-		String type = PDEJavaHelperUI.selectType(
-				fModel.getUnderlyingResource(),
-				IJavaElementSearchConstants.CONSIDER_CLASSES, filter, null);
-		if (type != null) {
-			entry.setValue(type);
-			entry.commit();
-		}
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java
deleted file mode 100644
index c8c9094..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java
+++ /dev/null

@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.sections;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSConstants;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.parts.ComboPart;
-import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-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.ui.forms.IFormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class DSOptionsSection extends PDESection {
-
-	private IDSComponent fComponent;
-	private FormEntry fFactoryEntry;
-	private IDSModel fModel;
-	private Button fImmediateButton;
-	private Button fEnabledButton;
-	private ComboPart fConfigurationPolicy;
-
-	public DSOptionsSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	protected void createClient(Section section, FormToolkit toolkit) {
-
-		initializeAttributes();
-
-		section.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		section.setLayoutData(data);
-		section.setText(Messages.DSOptionsSection_title);
-		section.setDescription(Messages.DSOptionsSection_description);
-
-		Composite client = toolkit.createComposite(section);
-		client.setLayout(new GridLayout(3, false));
-		client.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// Attribute: factory
-		fFactoryEntry = new FormEntry(client, toolkit,
-				Messages.DSComponentDetails_factoryEntry, SWT.NONE);
-
-		// Attribute: configuration policy
-		Label label = toolkit.createLabel(client,
-				Messages.DSComponentDetails_configurationPolicy,
-				SWT.WRAP);
-		label.setForeground(toolkit.getColors().getColor(
-IFormColors.TITLE));
-		fConfigurationPolicy = new ComboPart();
-		fConfigurationPolicy.createControl(client, toolkit, SWT.READ_ONLY);
-
-		String[] items = new String[] {
-				"", //$NON-NLS-1$
-				IDSConstants.VALUE_CONFIGURATION_POLICY_OPTIONAL,
-				IDSConstants.VALUE_CONFIGURATION_POLICY_REQUIRE,
-				IDSConstants.VALUE_CONFIGURATION_POLICY_IGNORE };
-		fConfigurationPolicy.setItems(items);
-		GridDataFactory.fillDefaults().grab(true, false).indent(3, 0).applyTo(
-				fConfigurationPolicy.getControl());
-
-		createButtons(client, toolkit);
-
-		setListeners();
-		updateUIFields();
-
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-
-	}
-
-	private void createButtons(Composite parent, FormToolkit toolkit) {
-		fEnabledButton = toolkit.createButton(parent,
-				Messages.DSServiceComponentSection_enabledButtonMessage,
-				SWT.CHECK);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		fEnabledButton.setLayoutData(data);
-		fEnabledButton.setEnabled(isEditable());
-		fEnabledButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fModel.getDSComponent().setEnabled(
-						fEnabledButton.getSelection());
-			}
-		});
-
-		fImmediateButton = toolkit.createButton(parent,
-				Messages.DSServiceComponentSection_immediateButtonMessage,
-				SWT.CHECK);
-		fImmediateButton.setLayoutData(data);
-		fImmediateButton.setEnabled(isEditable());
-		fImmediateButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fModel.getDSComponent().setImmediate(
-						fImmediateButton.getSelection());
-			}
-		});
-	}
-
-	private void initializeAttributes() {
-		fModel = (IDSModel) getPage().getModel();
-		fModel.addModelChangedListener(this);
-		fComponent = fModel.getDSComponent();
-	}
-
-	public void commit(boolean onSave) {
-		fFactoryEntry.commit();
-		super.commit(onSave);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		fComponent = fModel.getDSComponent();
-
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				updateUIFields();
-			}
-		});
-	}
-
-	public void updateUIFields() {
-		if (fComponent != null) {
-			if (fComponent.getFactory() == null) {
-				// Attribute: factory
-				fFactoryEntry.setValue("", true); //$NON-NLS-1$
-			} else {
-				// Attribute: factory
-				fFactoryEntry.setValue(fComponent.getFactory(), true);
-			}
-
-			fEnabledButton.setSelection(fComponent.getEnabled());
-			fImmediateButton.setSelection(fComponent.getImmediate());
-			enableOrDisableImmediate();
-			
-			// Attribute: Policy
-			if (fComponent.getConfigurationPolicy() != null)
-				fConfigurationPolicy.setText(fComponent
-						.getConfigurationPolicy());
-		}
-	}
-
-	private void enableOrDisableImmediate() {
-		boolean isService = false;
-		boolean isFactory = fComponent.getFactory() != null
-				&& !fComponent.getFactory().equals(""); //$NON-NLS-1$
-		boolean isImmediate = fComponent.getImmediate();
-		boolean enabled = true;
-
-		if (fComponent.getService() != null) {
-			IDSProvide[] providedServices = fComponent.getService()
-					.getProvidedServices();
-			if (providedServices != null && providedServices.length > 0) {
-				isService = true;
-			}
-		}
-		if (!isService && !isFactory && !isImmediate) {
-			enabled = false;
-		}
-
-		fImmediateButton.setEnabled(enabled);
-	}
-
-	public void setListeners() {
-		// Attribute: factory
-		fFactoryEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fComponent == null) {
-					return;
-				}
-				fComponent.setFactory(fFactoryEntry.getValue());
-			}
-		});
-
-		fConfigurationPolicy.addModifyListener(new ModifyListener(){
-		
-			public void modifyText(ModifyEvent e) {
-				// Ensure data object is defined
-				if (fComponent == null) {
-					return;
-				}
-				fComponent.setConfigurationPolicy(fConfigurationPolicy
-						.getSelection());
-			}
-		});
-		
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java
deleted file mode 100644
index 7078b7e..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java
+++ /dev/null

@@ -1,489 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 244997, 248216
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.sections;
-
-import java.util.Iterator;
-
-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.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelection;
-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.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSProperties;
-import org.eclipse.pde.internal.ds.core.IDSProperty;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.editor.DSInputContext;
-import org.eclipse.pde.internal.ds.ui.editor.DSLabelProvider;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.editor.dialogs.DSEditPropertiesDialog;
-import org.eclipse.pde.internal.ds.ui.editor.dialogs.DSEditPropertyDialog;
-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.parts.EditableTablePart;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class DSPropertiesSection extends TableSection {
-
-	private TableViewer fPropertiesTable;
-	private Action fRemoveAction;
-	private Action fAddPropertiesAction;
-	private Action fAddPropertyAction;
-	private Action fEditAction;
-
-	private static final int F_UP_FLAG = -1;
-	private static final int F_DOWN_FLAG = 1;
-
-	class ContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object inputElement) {
-			if (inputElement instanceof IDSModel) {
-				IDSModel model = (IDSModel) inputElement;
-				IDSComponent component = model.getDSComponent();
-				if (component != null) {
-					// gets all children from DS component to get properties and
-					// property elements in order of appearance
-					IDocumentElementNode[] childNodes = component
-							.getChildNodes();
-
-					// count the number of property and properties elements
-					int propertyLength = 0;
-					int propertiesLength = 0;
-					if (component.getPropertyElements() != null) {
-						propertyLength = component.getPropertyElements().length;
-					}
-
-					if (component.getPropertiesElements() != null) {
-						propertiesLength = component.getPropertiesElements().length;
-					}
-
-					// creates and returns an array with all property and
-					// properties elements
-					Object[] props = new Object[propertyLength
-							+ propertiesLength];
-					int index = 0;
-					for (int i = 0; i < childNodes.length; i++) {
-						IDocumentElementNode child = childNodes[i];
-						if (child instanceof IDSProperties
-								|| child instanceof IDSProperty) {
-							props[index] = child;
-							index++;
-						}
-
-					}
-					return props;
-
-				}
-
-			}
-			return new Object[0];
-		}
-	}
-
-	public DSPropertiesSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION,
-				new String[] { Messages.DSPropertiesSection_addProperties,
-						Messages.DSPropertiesSection_addProperty,
-						Messages.DSPropertiesSection_edit,
-						Messages.DSPropertiesSection_remove,
-						Messages.DSPropertiesSection_up,
-						Messages.DSPropertiesSection_down, });
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(Messages.DSPropertiesSection_title);
-		section.setDescription(Messages.DSPropertiesSection_description);
-
-		section.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		section.setLayoutData(data);
-
-		Composite container = createClientContainer(section, 2, toolkit);
-		EditableTablePart tablePart = getTablePart();
-		tablePart.setEditable(isEditable());
-
-		createViewerPartControl(container, SWT.FULL_SELECTION | SWT.MULTI, 2,
-				toolkit);
-		fPropertiesTable = tablePart.getTableViewer();
-		fPropertiesTable.setContentProvider(new ContentProvider());
-		fPropertiesTable.setLabelProvider(new DSLabelProvider());
-
-		makeActions();
-
-		IDSModel model = getDSModel();
-		if (model != null) {
-			fPropertiesTable.setInput(model);
-			model.addModelChangedListener(this);
-		}
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		IDSModel model = getDSModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-	}
-
-	public void refresh() {
-		fPropertiesTable.refresh();
-		updateButtons();
-		updateTitle();
-	}
-
-	private void updateTitle() {
-		int itemCount = fPropertiesTable.getTable().getItemCount();
-		getSection().setText(
-				NLS.bind(Messages.DSPropertiesSection_title, new Integer(
-						itemCount)));
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-		case 0:
-			handleAddProperties();
-			break;
-		case 1:
-			handleAddProperty();
-			break;
-		case 2:
-			handleEdit();
-			break;
-		case 3:
-			handleRemove();
-			break;
-		case 4:
-			handleUpDown(F_UP_FLAG);
-			break;
-		case 5:
-			handleUpDown(F_DOWN_FLAG);
-			break;
-		}
-	}
-
-	private void handleUpDown(int newRelativeIndex) {
-		ISelection sel = fPropertiesTable.getSelection();
-		Object[] array = ((IStructuredSelection) sel).toArray();
-
-		if (newRelativeIndex == F_UP_FLAG) {
-			moveUp(newRelativeIndex, array);
-		} else {
-			moveDown(newRelativeIndex, array);
-
-		}
-		return;
-	}
-
-	private void moveDown(int newRelativeIndex, Object[] array) {
-		for (int i = array.length - 1; i >= 0; i--) {
-			Object object = array[i];
-			if (object == null) {
-				continue;
-			} else if (object instanceof IDocumentElementNode) {
-				// Move the task object up or down one position
-				getDSModel().getDSComponent().moveChildNode(
-						(IDocumentElementNode) object, newRelativeIndex, true);
-			}
-		}
-	}
-
-	private void moveUp(int newRelativeIndex, Object[] array) {
-		for (int i = 0; i < array.length; i++) {
-			Object object = array[i];
-			if (object == null) {
-				continue;
-			} else if (object instanceof IDocumentElementNode) {
-				// Move the task object up or down one position
-				getDSModel().getDSComponent().moveChildNode(
-						(IDocumentElementNode) object, newRelativeIndex, true);
-			}
-		}
-	}
-
-	private void handleAddProperty() {
-		DSEditPropertyDialog dialog = new DSEditPropertyDialog(Activator
-				.getActiveWorkbenchShell(), createPropertyElement(), this, true);
-		dialog.open();
-
-	}
-
-	private void handleEdit() {
-
-		ISelection selection = fPropertiesTable.getSelection();
-		if (selection != null) {
-
-			int selectionIndex = fPropertiesTable.getTable()
-					.getSelectionIndex();
-			if (selectionIndex != -1) {
-				Object selectionElement = fPropertiesTable
-						.getElementAt(selectionIndex);
-
-				if (selectionElement instanceof IDSProperties) {
-					DSEditPropertiesDialog dialog = new DSEditPropertiesDialog(
-							Activator.getActiveWorkbenchShell(),
-							(IDSProperties) selectionElement, this);
-					dialog.create();
-					dialog.getShell().setSize(500, 200);
-					dialog.open();
-
-				} else if (selectionElement instanceof IDSProperty) {
-					DSEditPropertyDialog dialog = new DSEditPropertyDialog(
-							Activator.getActiveWorkbenchShell(),
-							(IDSProperty) selectionElement, this, false);
-					dialog.create();
-					dialog.getShell().setSize(500, 300);
-					dialog.open();
-				}
-			}
-
-		}
-
-	}
-
-	private void makeActions() {
-		fAddPropertiesAction = new Action(
-				Messages.DSPropertiesSection_addProperties) {
-			public void run() {
-				handleAddProperties();
-			}
-		};
-		fAddPropertiesAction.setEnabled(isEditable());
-
-		fAddPropertyAction = new Action(
-				Messages.DSPropertiesSection_addProperty) {
-			public void run() {
-				handleAddProperty();
-			}
-		};
-		fAddPropertyAction.setEnabled(isEditable());
-
-		fEditAction = new Action(Messages.DSPropertiesSection_edit) {
-			public void run() {
-				handleEdit();
-			}
-		};
-		fEditAction.setEnabled(isEditable());
-
-		fRemoveAction = new Action(Messages.DSPropertiesSection_remove) {
-			public void run() {
-				handleRemove();
-			}
-		};
-		fRemoveAction.setEnabled(isEditable());
-	}
-
-	private void updateButtons() {
-		Table table = fPropertiesTable.getTable();
-
-		TablePart tablePart = getTablePart();
-		tablePart.setButtonEnabled(0, isEditable());
-		tablePart.setButtonEnabled(1, isEditable());
-		tablePart.setButtonEnabled(2, isEditable()
-				&& table.getSelection().length > 0);
-		tablePart.setButtonEnabled(3, isEditable());
-		tablePart.setButtonEnabled(4, isEditable()
-				&& table.getSelection().length > 0 && !table.isSelected(0));
-		tablePart.setButtonEnabled(5, isEditable()
-				&& table.getSelection().length > 0
-				&& !table.isSelected(table.getItems().length - 1));
-	}
-
-	private void handleRemove() {
-		IStructuredSelection ssel = (IStructuredSelection) fPropertiesTable
-				.getSelection();
-		if (ssel.size() > 0) {
-			Iterator iter = ssel.iterator();
-			while (iter.hasNext()) {
-				Object object = iter.next();
-				if (object instanceof IDSProperties) {
-					getDSModel().getDSComponent().removePropertiesElement(
-							(IDSProperties) object);
-				}
-				if (object instanceof IDSProperty) {
-					getDSModel().getDSComponent().removePropertyElement(
-							(IDSProperty) object);
-				}
-			}
-		}
-	}
-
-	private void handleAddProperties() {
-		doOpenSelectionDialogProperties();
-	}
-
-	private void doOpenSelectionDialogProperties() {
-		final IProject project = getProject();
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
-				Activator.getActiveWorkbenchShell(),
-				new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		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 true;
-			}
-		});
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(Messages.DSPropertiesDetails_dialogTitle);
-		dialog.setMessage(Messages.DSPropertiesDetails_dialogMessage);
-		dialog.setValidator(new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection != null && selection.length > 0
-						&& selection[0] instanceof IFile)
-					return new Status(IStatus.OK, Activator.PLUGIN_ID,
-							IStatus.OK, "", null); //$NON-NLS-1$
-
-				return new Status(IStatus.ERROR, Activator.PLUGIN_ID,
-						IStatus.ERROR, "", null); //$NON-NLS-1$
-			}
-		});
-		if (dialog.open() == Window.OK) {
-			IResource res = (IResource) dialog.getFirstResult();
-			IPath path = res.getProjectRelativePath();
-			if (res instanceof IContainer)
-				path = path.addTrailingSeparator();
-			String value = path.toString();
-			addProperties(value);
-
-		}
-	}
-
-	private void addProperties(String entry) {
-
-		IDSDocumentFactory factory = getDSModel().getFactory();
-		IDSComponent component = getDSModel().getDSComponent();
-
-		IDSProperties properties = factory.createProperties();
-		// set interface attribute
-		properties.setEntry(entry);
-
-		// add properties
-		component.addPropertiesElement(properties);
-	}
-
-	private IDSProperty createPropertyElement() {
-
-		IDSDocumentFactory factory = getDSModel().getFactory();
-
-		IDSProperty property = factory.createProperty();
-
-		return property;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-			Object[] objects = e.getChangedObjects();
-			for (int i = 0; i < objects.length; i++) {
-				Table table = fPropertiesTable.getTable();
-				if (objects[i] instanceof IDSProperties) {
-					int index = table.getSelectionIndex();
-					fPropertiesTable.remove(objects[i]);
-					if (canSelect()) {
-						table.setSelection(index < table.getItemCount() ? index
-								: table.getItemCount() - 1);
-					}
-				}
-				if (objects[i] instanceof IDSProperty) {
-					int index = table.getSelectionIndex();
-					fPropertiesTable.remove(objects[i]);
-					if (canSelect()) {
-						table.setSelection(index < table.getItemCount() ? index
-								: table.getItemCount() - 1);
-					}
-				}
-			}
-			updateButtons();
-		} else if (e.getChangeType() == IModelChangedEvent.INSERT) {
-			Object[] objects = e.getChangedObjects();
-			if (objects.length > 0) {
-				fPropertiesTable.refresh();
-				fPropertiesTable.setSelection(new StructuredSelection(
-						objects[objects.length - 1]));
-			}
-			updateButtons();
-		} else {
-			fPropertiesTable.refresh();
-			updateButtons();
-		}
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				updateTitle();
-			}
-		});
-	}
-
-	private DSInputContext getDSContext() {
-		InputContextManager manager = getPage().getPDEEditor()
-				.getContextManager();
-		return (DSInputContext) manager.findContext(DSInputContext.CONTEXT_ID);
-	}
-
-	private IDSModel getDSModel() {
-		DSInputContext context = getDSContext();
-		return context == null ? null : (IDSModel) context.getModel();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (!isEditable()) {
-			return false;
-		}
-
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleRemove();
-			return true;
-		}
-
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSProvideSection.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSProvideSection.java
deleted file mode 100644
index 872b0b6..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSProvideSection.java
+++ /dev/null

@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.sections;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-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.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSProvide;
-import org.eclipse.pde.internal.ds.core.IDSService;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.editor.DSInputContext;
-import org.eclipse.pde.internal.ds.ui.editor.DSLabelProvider;
-import org.eclipse.pde.internal.ds.ui.editor.DSTypeSelectionExtension;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.editor.dialogs.DSEditProvideDialog;
-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.parts.EditableTablePart;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class DSProvideSection extends TableSection implements
-		IDoubleClickListener {
-
-	private TableViewer fProvidesTable;
-	private Action fRemoveAction;
-	private Action fAddAction;
-	private Action fEditAction;
-
-	class ContentProvider implements IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			if (inputElement instanceof IDSModel) {
-				IDSModel model = (IDSModel) inputElement;
-				IDSComponent component = model.getDSComponent();
-				if (component != null) {
-					IDSService service = component.getService();
-					if (service != null) {
-						return service.getProvidedServices();
-					}
-				}
-
-			}
-			return new Object[0];
-		}
-
-		public void dispose() {
-			// do nothing
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			// do nothing
-		}
-	}
-
-	public DSProvideSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION | Section.TWISTIE,
-				new String[] {
-				Messages.DSProvideSection_add,
-				Messages.DSProvideSection_remove,
-				Messages.DSProvideSection_edit });
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setDescription(Messages.DSProvideSection_description);
-		section.setExpanded(true);
-		section.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.grabExcessVerticalSpace = true;
-		section.setLayoutData(data);
-
-		Composite container = createClientContainer(section, 2, toolkit);
-		EditableTablePart tablePart = getTablePart();
-		tablePart.setEditable(isEditable());
-
-		createViewerPartControl(container, SWT.FULL_SELECTION | SWT.MULTI, 2,
-				toolkit);
-		fProvidesTable = tablePart.getTableViewer();
-		fProvidesTable.setContentProvider(new ContentProvider());
-		fProvidesTable.setLabelProvider(new DSLabelProvider());
-		fProvidesTable.setComparator(new ViewerComparator());
-		fProvidesTable.addDoubleClickListener(this);
-
-		makeActions();
-
-		IDSModel model = getDSModel();
-		if (model != null) {
-			fProvidesTable.setInput(model);
-			model.addModelChangedListener(this);
-		}
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		updateTitle();
-	}
-
-	public void dispose() {
-		IDSModel model = getDSModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-	}
-
-	public void refresh() {
-		fProvidesTable.refresh();
-		updateButtons();
-		updateTitle();
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-		case 0:
-			handleAdd();
-			break;
-		case 1:
-			handleRemove();
-			break;
-		case 2:
-			handleEdit();
-			break;
-		}
-	}
-
-	private void handleEdit() {
-
-		ISelection selection = fProvidesTable.getSelection();
-		if (selection != null) {
-
-			int selectionIndex = fProvidesTable.getTable().getSelectionIndex();
-			if (selectionIndex != -1) {
-				DSEditProvideDialog dialog = new DSEditProvideDialog(Activator
-						.getActiveWorkbenchShell(), (IDSProvide) fProvidesTable
-						.getElementAt(selectionIndex), this);
-				dialog.create();
-				dialog.getShell().setSize(500, 200);
-				dialog.open();
-			}
-
-		}
-
-	}
-
-	private void makeActions() {
-		fAddAction = new Action(Messages.DSProvideSection_add) {
-			public void run() {
-				handleAdd();
-			}
-		};
-		fAddAction.setEnabled(isEditable());
-
-		fRemoveAction = new Action(Messages.DSProvideSection_remove) {
-			public void run() {
-				handleRemove();
-			}
-		};
-		fRemoveAction.setEnabled(isEditable());
-
-		fEditAction = new Action(Messages.DSProvideSection_edit) {
-			public void run() {
-				handleRemove();
-			}
-		};
-		fEditAction.setEnabled(isEditable());
-	}
-
-	private void updateButtons() {
-		Table table = fProvidesTable.getTable();
-		TablePart tablePart = getTablePart();
-		tablePart.setButtonEnabled(0, isEditable());
-		tablePart.setButtonEnabled(1, isEditable()
-				&& table.getSelection().length > 0);
-		tablePart.setButtonEnabled(2, isEditable()
-				&& table.getSelection().length == 1);
-	}
-
-	private void handleRemove() {
-		IStructuredSelection ssel = (IStructuredSelection) fProvidesTable
-				.getSelection();
-		if (ssel.size() > 0) {
-			Iterator iter = ssel.iterator();
-			IDSService service = getDSModel().getDSComponent().getService();
-			while (iter.hasNext()) {
-				Object object = iter.next();
-				if (object instanceof IDSProvide) {
-					service.removeProvidedService((IDSProvide) object);
-				}
-			}
-			if (service.getProvidedServices().length == 0) {
-				getDSModel().getDSComponent().removeService(service);
-			}
-		}
-	}
-
-	private void handleAdd() {
-		doOpenSelectionDialog(IJavaElementSearchConstants.CONSIDER_CLASSES_AND_INTERFACES);
-	}
-
-	private void doOpenSelectionDialog(int scopeType) {
-		try {
-			String filter = ""; //$NON-NLS-1$
-			filter = filter.substring(filter.lastIndexOf(".") + 1); //$NON-NLS-1$
-			SelectionDialog dialog = JavaUI.createTypeDialog(Activator
-					.getActiveWorkbenchShell(), PlatformUI.getWorkbench()
-					.getProgressService(), SearchEngine.createWorkspaceScope(),
-					scopeType, true, filter, new DSTypeSelectionExtension(
-							getDSModel()));
-			dialog.setTitle(Messages.DSProvideDetails_selectType);
-			if (dialog.open() == Window.OK) {
-				Object[] result = dialog.getResult();
-				for (int i = 0; i < result.length; i++) {
-					IType type = (IType) result[i];
-					String fullyQualifiedName = type.getFullyQualifiedName('$');
-					addProvide(fullyQualifiedName);
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	private void addProvide(String fullyQualifiedName) {
-
-		IDSDocumentFactory factory = getDSModel().getFactory();
-		IDSComponent component = getDSModel().getDSComponent();
-
-		IDSService service = component.getService();
-		if (service == null) {
-			service = factory.createService();
-			component.setService(service);
-		}
-
-		IDSProvide provide = factory.createProvide();
-		// set interface attribute
-		provide.setInterface(fullyQualifiedName);
-
-		// add provide
-		service.addProvidedService(provide);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-			Object[] objects = e.getChangedObjects();
-			for (int i = 0; i < objects.length; i++) {
-				Table table = fProvidesTable.getTable();
-				if (objects[i] instanceof IDSProvide) {
-					int index = table.getSelectionIndex();
-					fProvidesTable.remove(objects[i]);
-					if (canSelect()) {
-						table.setSelection(index < table.getItemCount() ? index
-								: table.getItemCount() - 1);
-					}
-				}
-			}
-			updateButtons();
-			updateTitle();
-		} else if (e.getChangeType() == IModelChangedEvent.INSERT) {
-			Object[] objects = e.getChangedObjects();
-			if (objects.length > 0) {
-				fProvidesTable.refresh();
-				fProvidesTable.setSelection(new StructuredSelection(
-						objects[objects.length - 1]));
-			}
-			updateButtons();
-			updateTitle();
-		} else {
-			fProvidesTable.refresh();
-			updateButtons();
-		}
-	}
-
-	private DSInputContext getDSContext() {
-		InputContextManager manager = getPage().getPDEEditor()
-				.getContextManager();
-		return (DSInputContext) manager.findContext(DSInputContext.CONTEXT_ID);
-	}
-
-	private IDSModel getDSModel() {
-		DSInputContext context = getDSContext();
-		return context == null ? null : (IDSModel) context.getModel();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (!isEditable()) {
-			return false;
-		}
-
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleRemove();
-			return true;
-		}
-
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-
-	private void updateTitle() {
-		int itemCount = fProvidesTable.getTable().getItemCount();
-		getSection().setText(
-				NLS.bind(Messages.DSProvideSection_title,
-						new Integer(
-						itemCount)));
-	}
-
-	public void doubleClick(DoubleClickEvent event) {
-		IDSProvide provide = (IDSProvide) ((IStructuredSelection) fProvidesTable
-				.getSelection()).getFirstElement();
-		String value = provide.getInterface();
-		IProject project = getProject();
-		try {
-			if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement element = javaProject.findType(value.replace('$',
-						'.'));
-				if (element != null)
-					JavaUI.openInEditor(element);
-			}
-		} catch (PartInitException e) {
-			Activator.logException(e);
-		} catch (CoreException e) {
-			Activator.logException(e);
-		}
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java
deleted file mode 100644
index f7a03b5..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSReferenceSection.java
+++ /dev/null

@@ -1,456 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028, 248226
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.editor.sections;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-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.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.IDSReference;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.editor.DSInputContext;
-import org.eclipse.pde.internal.ds.ui.editor.DSLabelProvider;
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ds.ui.editor.dialogs.DSEditReferenceDialog;
-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.parts.EditableTablePart;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class DSReferenceSection extends TableSection implements
-		IDoubleClickListener {
-
-	private TableViewer fReferencesTable;
-	private Action fRemoveAction;
-	private Action fAddAction;
-	private Action fEditAction;
-
-	class ReferenceLabelProvider extends StyledCellLabelProvider {
-
-		private DSLabelProvider labelProvider = new DSLabelProvider();
-
-		public void update(ViewerCell cell) {
-			final Object element = cell.getElement();
-			IDSReference reference = (IDSReference) element;
-			String name = reference.getReferenceName();
-			if (name == null || name.length() == 0)
-				name = reference.getReferenceInterface();
-			if (name == null)
-				name = ""; //$NON-NLS-1$ // Better than an NPE
-			StyledString styledString = new StyledString(name);
-			String bind = reference.getReferenceBind();
-			String unbind = reference.getReferenceUnbind();
-			bind = (bind == null || bind.length() == 0 ? "<none>" : bind); //$NON-NLS-1$
-			unbind = (unbind == null || unbind.length() == 0 ? "<none>" : unbind); //$NON-NLS-1$
-			styledString
-					.append(
-							" [" + bind + "," + unbind + "]", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-			String target = reference.getReferenceTarget();
-			if (target != null)
-				styledString.append(" " + target, //$NON-NLS-1$
-						StyledString.QUALIFIER_STYLER);
-
-			cell.setText(styledString.toString());
-			cell.setStyleRanges(styledString.getStyleRanges());
-			cell.setImage(labelProvider.getImage(reference));
-			super.update(cell);
-		}
-
-		public void dispose() {
-			super.dispose();
-			labelProvider.dispose();
-		}
-
-	}
-
-	class ContentProvider implements IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			if (inputElement instanceof IDSModel) {
-				IDSModel model = (IDSModel) inputElement;
-				IDSComponent component = model.getDSComponent();
-				if (component != null)
-					return component.getReferences();
-
-			}
-			return new Object[0];
-		}
-
-		public void dispose() {
-			// do nothing
-
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			// do nothing
-		}
-	}
-
-	public DSReferenceSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION | Section.TWISTIE,
-				new String[] {
-				Messages.DSReferenceSection_add,
-				Messages.DSReferenceSection_remove,
-				Messages.DSReferenceSection_edit,
-				Messages.DSReferenceSection_up,
-				Messages.DSReferenceSection_down });
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setDescription(Messages.DSReferenceSection_description);
-		section.setExpanded(true);
-		section.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.grabExcessVerticalSpace = true;
-		section.setLayoutData(data);
-
-		Composite container = createClientContainer(section, 2, toolkit);
-		EditableTablePart tablePart = getTablePart();
-		tablePart.setEditable(isEditable());
-
-		createViewerPartControl(container, SWT.FULL_SELECTION | SWT.MULTI, 2,
-				toolkit);
-		fReferencesTable = tablePart.getTableViewer();
-
-		fReferencesTable.setContentProvider(new ContentProvider());
-		fReferencesTable.setLabelProvider(new ReferenceLabelProvider());
-		fReferencesTable.addDoubleClickListener(this);
-
-		makeActions();
-
-		IDSModel model = getDSModel();
-		if (model != null) {
-			fReferencesTable.setInput(model);
-			model.addModelChangedListener(this);
-		}
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		updateTitle();
-	}
-
-	public void dispose() {
-		IDSModel model = getDSModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-	}
-
-	public void refresh() {
-		fReferencesTable.refresh();
-		updateButtons();
-		updateTitle();
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-		case 0:
-			handleAdd();
-			break;
-		case 1:
-			handleRemove();
-			break;
-		case 2:
-			handleEdit();
-			break;
-		case 3:
-			handleMove(true);
-			break;
-		case 4:
-			handleMove(false);
-			break;
-		}
-	}
-
-	private void handleMove(boolean moveUp) {
-		ISelection selection = fReferencesTable.getSelection();
-		if (selection != null) {
-			Object[] array = ((IStructuredSelection) selection).toArray();
-			if (moveUp) {
-				moveUp(array);
-			} else {
-				moveDown(array);
-			}
-		}
-	}
-
-	private void moveDown(Object[] array) {
-		for (int i = array.length - 1; i >= 0; i--) {
-			Object object = array[i];
-			if (object == null) {
-				continue;
-			} else if (object instanceof IDocumentElementNode) {
-				// Move the task object up or down one position
-				getDSModel().getDSComponent().moveChildNode(
-						(IDocumentElementNode) object, 1, true);
-			}
-		}
-	}
-
-	private void moveUp(Object[] array) {
-		for (int i = 0; i < array.length; i++) {
-			Object object = array[i];
-			if (object == null) {
-				continue;
-			} else if (object instanceof IDocumentElementNode) {
-				// Move the task object up or down one position
-				getDSModel().getDSComponent().moveChildNode(
-						(IDocumentElementNode) object, -1, true);
-			}
-		}
-	}
-
-	private void handleEdit() {
-
-		ISelection selection = fReferencesTable.getSelection();
-		if (selection != null) {
-
-			int selectionIndex = fReferencesTable.getTable()
-					.getSelectionIndex();
-			if (selectionIndex != -1) {
-				DSEditReferenceDialog dialog = new DSEditReferenceDialog(
-						Activator.getActiveWorkbenchShell(),
-						(IDSReference) fReferencesTable
-								.getElementAt(selectionIndex), this);
-				dialog.create();
-				dialog.getShell().setSize(500, 400);
-				dialog.open();
-			}
-
-		}
-
-	}
-
-	private void makeActions() {
-		fAddAction = new Action(Messages.DSReferenceSection_add) {
-			public void run() {
-				handleAdd();
-			}
-		};
-		fAddAction.setEnabled(isEditable());
-
-		fRemoveAction = new Action(Messages.DSReferenceSection_remove) {
-			public void run() {
-				handleRemove();
-			}
-		};
-		fRemoveAction.setEnabled(isEditable());
-
-		fEditAction = new Action(Messages.DSReferenceSection_edit) {
-			public void run() {
-				handleEdit();
-			}
-		};
-		fEditAction.setEnabled(isEditable());
-
-	}
-
-	private void updateButtons() {
-		Table table = fReferencesTable.getTable();
-		TablePart tablePart = getTablePart();
-		tablePart.setButtonEnabled(0, isEditable());
-		int length = table.getSelection().length;
-		tablePart.setButtonEnabled(1, isEditable() && length > 0);
-		tablePart.setButtonEnabled(2, isEditable() && length > 0);
-
-		tablePart.setButtonEnabled(3, isEditable()
-				&& table.getSelection().length > 0 && !table.isSelected(0));
-		tablePart.setButtonEnabled(4, isEditable()
-				&& table.getSelection().length > 0
-				&& !table.isSelected(table.getItems().length - 1));
-	}
-
-	private void handleRemove() {
-		IStructuredSelection ssel = (IStructuredSelection) fReferencesTable
-				.getSelection();
-		if (ssel.size() > 0) {
-			Iterator iter = ssel.iterator();
-			while (iter.hasNext()) {
-				Object object = iter.next();
-				if (object instanceof IDSReference) {
-					getDSModel().getDSComponent().removeReference(
-							(IDSReference) object);
-				}
-			}
-		}
-	}
-
-	private void handleAdd() {
-		doOpenSelectionDialog(IJavaElementSearchConstants.CONSIDER_CLASSES_AND_INTERFACES);
-	}
-
-	private void doOpenSelectionDialog(int scopeType) {
-		try {
-			String filter = ""; //$NON-NLS-1$
-			filter = filter.substring(filter.lastIndexOf(".") + 1); //$NON-NLS-1$
-			SelectionDialog dialog = JavaUI.createTypeDialog(Activator
-					.getActiveWorkbenchShell(), PlatformUI.getWorkbench()
-					.getProgressService(), SearchEngine.createWorkspaceScope(),
-					scopeType, true, filter);
-			dialog.setTitle(Messages.DSReferenceDetails_selectType);
-			if (dialog.open() == Window.OK) {
-				Object[] result = dialog.getResult();
-				for (int i = 0; i < result.length; i++) {
-					IType type = (IType) result[i];
-					String fullyQualifiedName = type.getFullyQualifiedName('$');
-					addReference(fullyQualifiedName);
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	private void addReference(String fullyQualifiedName) {
-
-		IDSReference reference = getDSModel().getFactory().createReference();
-		// set interface attribute
-		reference.setReferenceInterface(fullyQualifiedName);
-
-		// set name attribute
-		int index = fullyQualifiedName.lastIndexOf("."); //$NON-NLS-1$
-		if (index != -1) {
-			fullyQualifiedName = fullyQualifiedName.substring(index + 1);
-		}
-		reference.setReferenceName(fullyQualifiedName);
-
-		// add reference
-		getDSModel().getDSComponent().addReference(reference);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-			Object[] objects = e.getChangedObjects();
-			for (int i = 0; i < objects.length; i++) {
-				Table table = fReferencesTable.getTable();
-				if (objects[i] instanceof IDSReference) {
-					int index = table.getSelectionIndex();
-					fReferencesTable.remove(objects[i]);
-					if (canSelect()) {
-						table.setSelection(index < table.getItemCount() ? index
-								: table.getItemCount() - 1);
-					}
-				}
-			}
-			updateButtons();
-			updateTitle();
-		} else if (e.getChangeType() == IModelChangedEvent.INSERT) {
-			Object[] objects = e.getChangedObjects();
-			if (objects.length > 0) {
-				fReferencesTable.refresh();
-				fReferencesTable.setSelection(new StructuredSelection(
-						objects[objects.length - 1]));
-			}
-			updateButtons();
-			updateTitle();
-		} else {
-			fReferencesTable.refresh();
-			updateButtons();
-		}
-	}
-
-	private DSInputContext getDSContext() {
-		InputContextManager manager = getPage().getPDEEditor()
-				.getContextManager();
-		return (DSInputContext) manager.findContext(DSInputContext.CONTEXT_ID);
-	}
-
-	private IDSModel getDSModel() {
-		DSInputContext context = getDSContext();
-		return context == null ? null : (IDSModel) context.getModel();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (!isEditable()) {
-			return false;
-		}
-
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleRemove();
-			return true;
-		}
-
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-
-	private void updateTitle() {
-		int itemCount = fReferencesTable.getTable().getItemCount();
-		getSection().setText(
-				NLS.bind(Messages.DSReferenceSection_title, new Integer(
-						itemCount)));
-	}
-
-	public void doubleClick(DoubleClickEvent event) {
-		IDSReference reference = (IDSReference) ((IStructuredSelection) fReferencesTable
-				.getSelection()).getFirstElement();
-		String value = reference.getReferenceInterface();
-		IProject project = getProject();
-		try {
-			if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement element = javaProject.findType(value.replace('$',
-						'.'));
-				if (element != null)
-					JavaUI.openInEditor(element);
-			}
-		} catch (PartInitException e) {
-			Activator.logException(e);
-		} catch (CoreException e) {
-			Activator.logException(e);
-		}
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/messages.properties b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/messages.properties
deleted file mode 100644
index 4bd8e8a..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/messages.properties
+++ /dev/null

@@ -1,166 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#	  EclipseSource Corporation - ongoing enhancements
-###############################################################################
-
-
-DSAddItemAction_addProperties=Add Properties
-DSAddItemAction_addProperty=Add Property
-DSAddItemAction_addProvidedService=Add Provided Service
-DSAddItemAction_addReferencedService=Add Reference Service
-DSAddItemAction_addService=Add Service
-
-DSComponentDetails_mainSectionTitle=Definition
-DSComponentDetails_mainSectionDescription=Specify the component's attributes:
-DSComponentDetails_nameEntry=Name:
-DSComponentDetails_activateEntry=Activate:
-DSComponentDetails_activateTooltip=The activate method name
-DSComponentDetails_deactivateEntry=Deactivate:
-DSComponentDetails_deactivateTooltip=The deactivate method name
-DSComponentDetails_modifiedEntry=Modified:
-DSComponentDetails_modifiedTooltip=The modified method name
-DSComponentDetails_factoryEntry=Factory ID:
-DSComponentDetails_configurationPolicy=Configuration Policy:
-DSComponentDetails_enabledLabel=Enabled:
-DSComponentDetails_immediateLabel=Immediate:
-DSComponentDetails_browse=Browse...
-
-DSCreationOperation_title=Creating Component File...
-
-DSFileWizardPage_description=Create a new component definition.
-DSFileWizardPage_title=Component Definition
-DSFileWizardPage_group=Component Definition Information
-DSFileWizardPage_component_name=N&ame: 
-DSFileWizardPage_implementation_class=C&lass:
-DSFileWizardPage_browse=Bro&wse...
-DSFileWizardPage_selectType= Select Type
-DSFileWizardPage_not_OSGI_folder=By convention, component files should be located in OSGI-INF/ folder
-
-DSNewWizard_title=New Component Definition
-
-DSImplementationDetails_title=Definition
-DSImplementationDetails_description=Specify the service's implementation class:
-DSImplementationDetails_classEntry=Class*:
-DSImplementationDetails_browse=Browse...
-DSImplementationDetails_selectType= Select Type
-
-DSSimpPage_title = Overview
-DSServicesPage_title = Services
-
-DSSection_title=Component
-DSSection_description=Specify the component's name, class and method signatures:
-
-DSOptionsSection_title=Options
-DSOptionsSection_description=Specify the component's options:
-
-DSReferenceSection_title=Referenced Services ({0})
-DSReferenceSection_description=Specify the referenced services:
-DSReferenceSection_add=Add...
-DSReferenceSection_remove=Remove
-DSReferenceSection_edit=Edit...
-DSReferenceSection_up=Up
-DSReferenceSection_down=Down
-
-DSPropertiesSection_title=Properties ({0})
-DSPropertiesSection_description=Specify the component's properties:
-DSPropertiesSection_addProperties=Add File...
-DSPropertiesSection_addProperty=Add Property...
-DSPropertiesSection_remove=Remove
-DSPropertiesSection_edit=Edit...
-DSPropertiesSection_up=Up
-DSPropertiesSection_down=Down
-
-DSProvideSection_title=Provided Services ({0})
-DSProvideSection_description=Specify the provided services:
-DSProvideSection_add=Add...
-DSProvideSection_remove=Remove
-DSProvideSection_edit=Edit...
-DSProvideSection_ServiceFactoryButtonMessage=Service Factory
-
-DSEditReferenceDialog_OK=OK
-DSEditReferenceDialog_Cancel=Cancel
-DSEditReferenceDialog_dialogMessage=Specify the referenced service's attributes:
-DSEditReferenceDialog_dialog_title=Referenced Service
-
-DSEditProvideDialog_OK=OK
-DSEditProvideDialog_Cancel=Cancel
-DSEditProvideDialog_dialogMessage=Specify the provided service's attributes:
-DSEditProvideDialog_dialog_title=Provided Service
-
-DSEditPropertiesDialog_OK=OK
-DSEditPropertiesDialog_Cancel=Cancel
-DSEditPropertiesDialog_dialogMessage=Specify the service's properties entry:
-DSEditPropertiesDialog_dialog_title=Service's Properties
-
-DSEditPropertyDialog_dialogMessage=Specify the service's properties entry:
-DSEditPropertyDialog_dialog_title=Service's Properties
-DSEditPropertyDialog_valuesLabel=Values:
-
-DSPage_title = Details
-DSPage_errorTitle=DS Load Failure
-DSPage_errorMessage=An error was encountered while parsing the DS XML file.
-DSPage_formTitle=Definition
-
-DSPluginTemplateWizard_title=DS Plug-in Template Wizard
-
-DSPropertiesDetails_sectionTitle=Definition
-DSPropertiesDetails_sectionDescription=Specify the properties entry: 
-DSPropertiesDetails_entry=Entry*:
-DSPropertiesDetails_browse = Browse...
-DSPropertiesDetails_dialogTitle = Resource
-DSPropertiesDetails_dialogMessage = Select a properties file:
-
-DSPropertyDetails_mainSectionText=Definition
-DSPropertyDetails_mainSectionDescription=Specify the property's attributes:
-DSPropertyDetails_nameEntry=Name*:
-DSPropertyDetails_valueEntry=Value:
-DSPropertyDetails_typeEntry=Type:
-DSPropertyDetails_bodyLabel=Body:
-
-DSProvideDetails_mainSectionText=Definition
-DSProvideDetails_mainSectionDesc=Specify the service's provided interface:
-DSProvideDetails_interface=Interface*:
-DSProvideDetails_browse = Browse...
-DSProvideDetails_selectType = Select Type
-
-DSServiceDetails_sectionTitle=Definition
-DSServiceDetails_sectionDescription=Specify the service's attributes:
-DSServiceDetails_serviceFactoryLabel=ServiceFactory:
-
-DSSourcePage_partName=Source
-
-DSMasterTreeSection_addService = Add Component
-DSMasterTreeSection_addProperty = Add Property
-DSMasterTreeSection_addProperties = Add Properties
-DSMasterTreeSection_addReference = Add Referenced Service
-DSMasterTreeSection_addProvide = Add Provided Service
-DSMasterTreeSection_up = Up
-DSMasterTreeSection_down = Down
-DSMasterTreeSection_remove = Remove
-DSMasterTreeSection_client_text = Content
-DSMasterTreeSection_client_description = Edit the structure of this component definition in the following section.
-
-DSReferenceDetails_title=Definition
-DSReferenceDetails_description=Specify the reference's component attributes:
-DSReferenceDetails_bindEntry=Bind:
-DSReferenceDetails_unbindEntry=Unbind:
-DSReferenceDetails_policeLabel=Policy:
-DSReferenceDetails_nameEntry=Name:
-DSReferenceDetails_interfaceEntry=Interface*:
-DSReferenceDetails_cardinalityLabel=Cardinality:
-DSReferenceDetails_targetEntry=Target:
-DSReferenceDetails_browse=Browse...
-DSReferenceDetails_selectType=Select Type
-
-DSRemoveItemAction_actionText=Delete
-
-DSServiceComponentSection_immediateButtonMessage=This component is immediately activated
-DSServiceComponentSection_enabledButtonMessage=This component is enabled when started
-DSService_title=Services
\ No newline at end of file

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/ComboPart.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/ComboPart.java
deleted file mode 100644
index 13cfa72..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/ComboPart.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class ComboPart {
-
-	protected 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, false);
-	}
-
-	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);
-	}
-
-	/**
-	 * @param index
-	 */
-	public void remove(int index) {
-		// Ensure the index is valid
-		if ((index < 0) || (index >= getItemCount())) {
-			return;
-		}
-		// Remove the item from the specified index
-		if (combo instanceof Combo) {
-			((Combo) combo).remove(index);
-		} else {
-			((CCombo) combo).remove(index);
-		}
-	}
-
-	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).getText().trim();
-		return ((CCombo) combo).getText().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);
-	}
-
-	public void setEnabled(boolean enabled) {
-		if (combo instanceof Combo)
-			((Combo) combo).setEnabled(enabled);
-		else
-			((CCombo) combo).setEnabled(enabled);
-	}
-
-	public int getItemCount() {
-		if (combo instanceof Combo)
-			return ((Combo) combo).getItemCount();
-		return ((CCombo) combo).getItemCount();
-	}
-
-	public String[] getItems() {
-		if (combo instanceof Combo)
-			return ((Combo) combo).getItems();
-		return ((CCombo) combo).getItems();
-	}
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/FormEntry.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/FormEntry.java
deleted file mode 100644
index 4f7c26b..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/FormEntry.java
+++ /dev/null

@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.parts;
-
-import org.eclipse.pde.internal.ds.ui.editor.FormLayoutFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.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.Layout;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.IFormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * 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 fLabel;
-	private Text fText;
-	private Button fBrowse;
-	private String fValue = ""; //$NON-NLS-1$
-	private boolean fDirty;
-	boolean fIgnoreModify = false;
-	private IFormEntryListener fListener;
-
-	public static final int F_DEFAULT_TEXT_WIDTH_HINT = 100;
-
-	/**
-	 * 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);
-			fLabel = link;
-		} else {
-			if (labelText != null) {
-				fLabel = toolkit.createLabel(parent, labelText);
-				fLabel.setForeground(toolkit.getColors().getColor(
-						IFormColors.TITLE));
-			}
-		}
-		fText = toolkit.createText(parent, "", style); //$NON-NLS-1$
-		addListeners();
-		if (browseText != null) {
-			fBrowse = toolkit.createButton(parent, browseText, SWT.PUSH);
-			fBrowse.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (fListener != null)
-						fListener.browseButtonSelected(FormEntry.this);
-				}
-			});
-		}
-		fillIntoGrid(parent, indent, tcolspan);
-		// Set the default text width hint and let clients modify
-		// accordingly
-		// after the fact
-		setTextWidthHint(F_DEFAULT_TEXT_WIDTH_HINT);
-	}
-
-	public void setEditable(boolean editable) {
-		fText.setEditable(editable);
-		if (fLabel instanceof Hyperlink)
-			((Hyperlink) fLabel).setUnderlined(editable);
-
-		if (fBrowse != null)
-			fBrowse.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 = fBrowse != null ? span - 2 : span - 1;
-			GridData gd;
-			if (fLabel != null) {
-				gd = new GridData(GridData.VERTICAL_ALIGN_CENTER);
-				gd.horizontalIndent = indent;
-				fLabel.setLayoutData(gd);
-			}
-			gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-			gd.horizontalSpan = tspan;
-			if (fLabel != null) {
-				gd.horizontalIndent = FormLayoutFactory.CONTROL_HORIZONTAL_INDENT;
-			}
-			gd.grabExcessHorizontalSpace = (tspan == 1);
-			gd.widthHint = 10;
-			fText.setLayoutData(gd);
-			if (fBrowse != null) {
-				gd = new GridData(GridData.VERTICAL_ALIGN_CENTER);
-				fBrowse.setLayoutData(gd);
-			}
-		} else if (layout instanceof TableWrapLayout) {
-			int span = ((TableWrapLayout) layout).numColumns;
-			if (tcolspan > 0)
-				tspan = tcolspan;
-			else
-				tspan = fBrowse != null ? span - 2 : span - 1;
-			TableWrapData td;
-			if (fLabel != null) {
-				td = new TableWrapData();
-				td.valign = TableWrapData.MIDDLE;
-				td.indent = indent;
-				fLabel.setLayoutData(td);
-			}
-			td = new TableWrapData(TableWrapData.FILL);
-			td.colspan = tspan;
-			if (fLabel != null) {
-				td.indent = FormLayoutFactory.CONTROL_HORIZONTAL_INDENT;
-			}
-			td.grabHorizontal = (tspan == 1);
-			td.valign = TableWrapData.MIDDLE;
-			fText.setLayoutData(td);
-			if (fBrowse != null) {
-				td = new TableWrapData(TableWrapData.FILL);
-				td.valign = TableWrapData.MIDDLE;
-				fBrowse.setLayoutData(td);
-			}
-		}
-	}
-
-	/**
-	 * Attaches the listener for the entry.
-	 * 
-	 * @param listener
-	 */
-	public void setFormEntryListener(IFormEntryListener listener) {
-		if (fLabel != null && fLabel instanceof Hyperlink) {
-			if (this.fListener != null)
-				((Hyperlink) fLabel).removeHyperlinkListener(this.fListener);
-			if (listener != null)
-				((Hyperlink) fLabel).addHyperlinkListener(listener);
-		}
-		this.fListener = listener;
-	}
-
-	private void addListeners() {
-		fText.addKeyListener(new KeyAdapter() {
-			public void keyReleased(KeyEvent e) {
-				keyReleaseOccured(e);
-			}
-		});
-		fText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				editOccured(e);
-			}
-		});
-		fText.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				if (fListener != null)
-					fListener.focusGained(FormEntry.this);
-			}
-
-			public void focusLost(FocusEvent e) {
-				if (fDirty)
-					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 (fDirty) {
-			fValue = fText.getText();
-			// if (value.length()==0)
-			// value = null;
-			// notify
-			if (fListener != null)
-				fListener.textValueChanged(this);
-		}
-		fDirty = false;
-	}
-
-	public void cancelEdit() {
-		fDirty = false;
-	}
-
-	private void editOccured(ModifyEvent e) {
-		if (fIgnoreModify)
-			return;
-		fDirty = true;
-		if (fListener != null)
-			fListener.textDirty(this);
-	}
-
-	/**
-	 * Returns the text control.
-	 * 
-	 * @return
-	 */
-	public Text getText() {
-		return fText;
-	}
-
-	public Control getLabel() {
-		return fLabel;
-	}
-
-	/**
-	 * Returns the browse button control.
-	 * 
-	 * @return
-	 */
-	public Button getButton() {
-		return fBrowse;
-	}
-
-	/**
-	 * 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 fValue.trim();
-	}
-
-	/**
-	 * Returns true if the text has been modified.
-	 * 
-	 * @return
-	 */
-	public boolean isDirty() {
-		return fDirty;
-	}
-
-	private void keyReleaseOccured(KeyEvent e) {
-		if (e.character == '\r') {
-			// commit value
-			if (fDirty)
-				commit();
-		} else if (e.character == '\u001b') { // Escape character
-			if (!fValue.equals(fText.getText()))
-				fText.setText(fValue != null ? fValue : ""); // //$NON-NLS-1$
-																// restore
-																// old
-			fDirty = false;
-		}
-		if (fListener != null)
-			fListener.selectionChanged(FormEntry.this);
-	}
-
-	/**
-	 * Sets the value of this entry.
-	 * 
-	 * @param value
-	 */
-	public void setValue(String value) {
-		if (fText != null)
-			fText.setText(value != null ? value : ""); //$NON-NLS-1$
-		this.fValue = (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) {
-		fIgnoreModify = blockNotification;
-		setValue(value);
-		fIgnoreModify = false;
-	}
-
-	public void setVisible(boolean visible) {
-		if (fLabel != null)
-			fLabel.setVisible(visible);
-		if (fText != null)
-			fText.setVisible(visible);
-		if (fBrowse != null)
-			fBrowse.setVisible(visible);
-	}
-
-	/**
-	 * If GridData was used, set the width hint. If TableWrapData was used
-	 * set the max width. If no layout data was specified, this method does
-	 * nothing.
-	 * 
-	 * @param width
-	 */
-	public void setTextWidthHint(int width) {
-		Object data = getText().getLayoutData();
-		if (data == null) {
-			return;
-		} else if (data instanceof GridData) {
-			((GridData) data).widthHint = width;
-		} else if (data instanceof TableWrapData) {
-				((TableWrapData) data).maxWidth = width;
-			}
-		}
-	}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/IFormEntryListener.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/IFormEntryListener.java
deleted file mode 100644
index 935fe66..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/parts/IFormEntryListener.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.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/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java
deleted file mode 100644
index 94394de..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *     IBM - ongoing maintenance
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.core.build.IBuildModelFactory;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.ibundle.IBundleModel;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.natures.PDE;
-import org.eclipse.pde.internal.core.project.PDEProject;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ds.core.IDSComponent;
-import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
-import org.eclipse.pde.internal.ds.core.IDSImplementation;
-import org.eclipse.pde.internal.ds.core.IDSModel;
-import org.eclipse.pde.internal.ds.core.text.DSModel;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.IConstants;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ui.util.ModelModification;
-import org.eclipse.pde.internal.ui.util.PDEModelUtility;
-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.ISetSelectionTarget;
-
-public class DSCreationOperation extends WorkspaceModifyOperation {
-
-	protected IFile fFile;
-	private String fComponentName;
-	private String fImplementationClass;
-
-	private final String DS_MANIFEST_KEY = "Service-Component"; //$NON-NLS-1$
-
-	/**
-	 * 
-	 */
-	public DSCreationOperation(IFile file, String componentName,
-			String implementationClass) {
-		fFile = file;
-		fComponentName = componentName;
-		fImplementationClass = implementationClass;
-	}
-
-	/*
-	 * (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(Messages.DSCreationOperation_title, 3);
-		createContent();
-		monitor.worked(1);
-		openFile();
-		if (PDE.hasPluginNature(fFile.getProject())) {
-		writeManifest(fFile.getProject(), new SubProgressMonitor(
-				monitor, 1));
-		writeBuildProperties(fFile.getProject(), new SubProgressMonitor(
-				monitor, 1));
-		}
-		monitor.done();
-	}
-
-	private void writeManifest(IProject project,
-			SubProgressMonitor monitor) {
-
-		PDEModelUtility.modifyModel(new ModelModification(project) {
-
-			protected void modifyModel(IBaseModel model,
-					IProgressMonitor monitor) throws CoreException {
-
-				if (model instanceof IBundlePluginModelBase)
-					updateManifest((IBundlePluginModelBase) model, monitor);
-			}
-		}, monitor);
-		monitor.done();
-
-	}
-
-	private void writeBuildProperties(final IProject project,
-			SubProgressMonitor monitor) {
-
-		PDEModelUtility.modifyModel(new ModelModification(PDEProject
-				.getBuildProperties(project)) {
-			protected void modifyModel(IBaseModel model,
-					IProgressMonitor monitor) throws CoreException {
-				if (!(model instanceof IBuildModel))
-					return;
-				IFile file = PDEProject.getBuildProperties(project);
-				if (file.exists()) {
-					WorkspaceBuildModel wbm = new WorkspaceBuildModel(file);
-					wbm.load();
-					if (!wbm.isLoaded())
-						return;
-					IBuildModelFactory factory = wbm.getFactory();
-					String path = fFile.getFullPath().removeFirstSegments(1).toPortableString();
-					IBuildEntry entry = wbm.getBuild().getEntry(
-							IBuildEntry.BIN_INCLUDES);
-					if (entry == null) {
-						entry = factory.createEntry(IBuildEntry.BIN_INCLUDES);
-						wbm.getBuild().add(entry);
-					}
-					entry.addToken(path);
-					wbm.save();
-				}
-			}
-		}, null);
-
-		monitor.done();
-
-	}
-
-	private void updateManifest(IBundlePluginModelBase model,
-			IProgressMonitor monitor) throws CoreException {
-		IBundleModel bundleModel = model.getBundleModel();
-		String filePath = fFile.getFullPath().removeFirstSegments(1)
-				.toPortableString();
-
-		String header = bundleModel.getBundle().getHeader(DS_MANIFEST_KEY);
-		if (header != null) {
-			if (containsValue(header, filePath)) {
-				return;
-			}
-			filePath = header + ", " + filePath; //$NON-NLS-1$
-		}
-		bundleModel.getBundle().setHeader(DS_MANIFEST_KEY, filePath);
-	}
-
-	private boolean containsValue(String header, String value) {
-		value = value.trim();
-		StringTokenizer st = new StringTokenizer(header, ",");
-		while (st.hasMoreElements()) {
-			String token = st.nextToken();
-			if (value.equals(token.trim())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected void createContent() throws CoreException {
-		IDSModel model = new DSModel(CoreUtility.getTextDocument(fFile
-				.getContents()), false);
-		model.setUnderlyingResource(fFile);
-		initializeDS(model.getDSComponent(), fFile);
-		model.save();
-		model.dispose();
-	}
-
-	/**
-	 * @param component
-	 * @param file
-	 */
-	protected void initializeDS(IDSComponent component, IFile file) {
-		IDSDocumentFactory factory = component.getModel().getFactory();
-
-		IDSImplementation implementation = factory.createImplementation();
-		implementation.setClassName(fImplementationClass);
-		component.setImplementation(implementation);
-		component.setAttributeName(fComponentName);
-
-		try {
-			// Add builder
-			IProject project = file.getProject();
-			IProjectDescription description = project.getDescription();
-			ICommand[] commands = description.getBuildSpec();
-
-			for (int i = 0; i < commands.length; ++i) {
-				if (commands[i].getBuilderName().equals(IConstants.ID_BUILDER)) {
-					return;
-				}
-			}
-
-			ICommand[] newCommands = new ICommand[commands.length + 1];
-			System.arraycopy(commands, 0, newCommands, 0, commands.length);
-			ICommand command = description.newCommand();
-			command.setBuilderName(IConstants.ID_BUILDER);
-			newCommands[newCommands.length - 1] = command;
-			description.setBuildSpec(newCommands);
-			project.setDescription(description, null);
-
-		} catch (CoreException e) {
-			Activator.logException(e, null, null);
-		}
-
-	}
-
-	/**
-	 * 
-	 */
-	private void openFile() {
-		Display.getCurrent().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchWindow window = Activator.getActiveWorkbenchWindow();
-				if (window == null) {
-					return;
-				}
-				IWorkbenchPage page = window.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 {
-					IDE.openEditor(page, fFile);
-				} catch (PartInitException e) {
-					// Ignore
-				}
-			}
-		});
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java
deleted file mode 100644
index 4afc1e3..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSFileWizardPage.java
+++ /dev/null

@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *     Simon Archer <sarcher@us.ibm.com> - bug 248519
- *     IBM - ongoing maintenance
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
-import org.eclipse.pde.internal.core.natures.PDE;
-import org.eclipse.pde.internal.core.project.PDEProject;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.pde.internal.ds.ui.SWTUtil;
-import org.eclipse.pde.internal.ds.ui.SharedImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.osgi.framework.Constants;
-
-public class DSFileWizardPage extends WizardNewFileCreationPage {
-
-	public static final String F_PAGE_NAME = "ds"; //$NON-NLS-1$
-
-	private static final String F_FILE_EXTENSION = "xml"; //$NON-NLS-1$
-
-	private static final String F_DEFAULT_COMPONENT_NAME = "component.xml"; //$NON-NLS-1$
-
-	private static final String S_COMPONENT_NAME = "component"; //$NON-NLS-1$
-
-	private Group fGroup;
-
-	private Text fDSComponentNameText;
-	private Label fDSComponentNameLabel;
-
-	private Text fDSImplementationClassText;
-	private Link fDSImplementationClassHyperlink;
-	private Button fDSImplementationClassButton;
-
-	private IStructuredSelection fSelection;
-
-	public DSFileWizardPage(IStructuredSelection selection) {
-		super(F_PAGE_NAME, selection);
-		this.fSelection = selection;
-		initialize();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.CheatSheetFileWizardPage#initialize()
-	 */
-	protected void initialize() {
-		setTitle(Messages.DSFileWizardPage_title);
-		setDescription(Messages.DSFileWizardPage_description);
-		setImageDescriptor(SharedImages
-				.getImageDescriptor(SharedImages.DESC_DS_WIZ));
-		// Force the file extension to be 'xml'
-		setFileExtension(F_FILE_EXTENSION);
-	}
-
-	private void setComponentName() {
-		Object element = fSelection.getFirstElement();
-		if (element != null) {
-			IProject project = getProject(element);
-			if (project != null)
-				setComponentNameText(project);
-		}
-	}
-
-	private IProject getProject(Object element) {
-		IProject project = null;
-		if (element instanceof IResource) {
-			project = ((IResource) element).getProject();
-		} else if (element instanceof IJavaElement) {
-			project = ((IJavaElement) element).getJavaProject().getProject();
-		} else if (element instanceof ClassPathContainer) {
-			project = ((ClassPathContainer) element).getJavaProject()
-					.getProject();
-		}
-		return project;
-	}
-
-	private void setComponentNameText(IProject project) {
-		try {
-			if (project.hasNature(PDE.PLUGIN_NATURE)) {
-				WorkspaceBundlePluginModel model = new WorkspaceBundlePluginModel(
-						PDEProject.getManifest(project),
-						null);
-				model.load();
-				String header = model.getBundleModel().getBundle().getHeader(
-						Constants.BUNDLE_SYMBOLICNAME);
-				String[] h = header.split(";"); //$NON-NLS-1$
-				fDSComponentNameText.setText(h[0]);
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	protected void createAdvancedControls(Composite parent) {
-		IDialogSettings settings = getDialogSettings();
-		if (settings != null) {
-			String component = settings.get(S_COMPONENT_NAME);
-			if (component != null && !component.equals("")) { //$NON-NLS-1$
-				setFileName(component);
-			} else {
-				setFileName(F_DEFAULT_COMPONENT_NAME);
-			}
-		} else {
-			setFileName(F_DEFAULT_COMPONENT_NAME);
-		}
-
-		// Controls Group
-		fGroup = new Group(parent, SWT.NONE);
-		fGroup.setText(Messages.DSFileWizardPage_group);
-		fGroup.setLayout(new GridLayout(3, false));
-		fGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		GridData nameTextGridData = new GridData(GridData.FILL_HORIZONTAL);
-		nameTextGridData.horizontalSpan = 2;
-		nameTextGridData.horizontalIndent = 3;
-
-		fDSComponentNameLabel = new Label(fGroup, SWT.None);
-		fDSComponentNameLabel.setText(Messages.DSFileWizardPage_component_name);
-
-		fDSComponentNameText = new Text(fGroup, SWT.SINGLE | SWT.BORDER);
-		fDSComponentNameText.setLayoutData(nameTextGridData);
-		fDSComponentNameText.setText(""); //$NON-NLS-1$
-		fDSComponentNameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(isPageComplete());
-			}
-		});
-		setComponentName();
-
-		fDSImplementationClassHyperlink = new Link(fGroup, SWT.NONE);
-		fDSImplementationClassHyperlink.setText("<a>" //$NON-NLS-1$
-				+ Messages.DSFileWizardPage_implementation_class + "</a>"); //$NON-NLS-1$
-		fDSImplementationClassHyperlink.setForeground(Display.getDefault()
-				.getSystemColor(SWT.COLOR_BLUE));
-		fDSImplementationClassHyperlink
-				.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						String value = fDSImplementationClassText.getText();
-						value = handleLinkActivated(value, false);
-						if (value != null)
-							fDSImplementationClassText.setText(value);
-
-			}
-
-			private String handleLinkActivated(String value,
-							boolean isInter) {
-						Object object = fSelection.getFirstElement();
-						if (object != null) {
-							IProject project = getProject(object);
-							try {
-								if (project != null
-										&& project
-												.hasNature(JavaCore.NATURE_ID)) {
-									IJavaProject javaProject = JavaCore
-											.create(project);
-									IJavaElement element = javaProject
-											.findType(value.replace('$', '.'));
-									if (element != null)
-										JavaUI.openInEditor(element);
-									else {
-										// TODO create our own wizard for reuse
-										// here
-										DSNewClassCreationWizard wizard = new DSNewClassCreationWizard(
-												project, isInter, value);
-										WizardDialog dialog = new WizardDialog(
-												Activator
-														.getActiveWorkbenchShell(),
-												wizard);
-										dialog.create();
-										SWTUtil.setDialogSize(dialog, 400, 500);
-										if (dialog.open() == Window.OK) {
-											return wizard.getQualifiedName();
-								}
-							}
-						}
-							} catch (PartInitException e1) {
-							} catch (CoreException e1) {
-					}
-						}
-						return null;
-					}
-
-		});
-
-		// Implementation Class Text
-		fDSImplementationClassText = new Text(fGroup, SWT.SINGLE | SWT.BORDER);
-		GridData classTextGridData = new GridData(GridData.FILL_HORIZONTAL);
-		classTextGridData.horizontalSpan = 1;
-		classTextGridData.horizontalIndent = 3;
-		fDSImplementationClassText.setLayoutData(classTextGridData);
-		fDSImplementationClassText.setText(""); //$NON-NLS-1$
-		fDSImplementationClassText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(isPageComplete());
-			}
-		});
-
-		// Implementation Class Browse Button
-		fDSImplementationClassButton = new Button(fGroup, SWT.NONE);
-		fDSImplementationClassButton.setText(Messages.DSFileWizardPage_browse);
-		fDSImplementationClassButton.addMouseListener(new MouseListener() {
-
-			public void mouseDoubleClick(MouseEvent e) {
-				// do nothing
-			}
-
-			public void mouseDown(MouseEvent e) {
-				// do nothing
-			}
-
-			public void mouseUp(MouseEvent e) {
-				doOpenSelectionDialog(
-						IJavaElementSearchConstants.CONSIDER_CLASSES,
-						fDSImplementationClassText);
-			}
-
-			private void doOpenSelectionDialog(int scopeType, Text entry) {
-				try {
-					String filter = entry.getText();
-					filter = filter.substring(filter.lastIndexOf(".") + 1); //$NON-NLS-1$
-					SelectionDialog dialog = JavaUI.createTypeDialog(Activator
-							.getActiveWorkbenchShell(), PlatformUI
-							.getWorkbench().getProgressService(), SearchEngine
-							.createWorkspaceScope(), scopeType, false, filter);
-					dialog.setTitle(Messages.DSFileWizardPage_selectType);
-					if (dialog.open() == Window.OK) {
-						IType type = (IType) dialog.getResult()[0];
-						entry.setText(type.getFullyQualifiedName('$'));
-					}
-				} catch (CoreException e) {
-					Activator.logException(e);
-				}
-			}
-		});
-	}
-
-	public String getDSComponentNameValue() {
-		return fDSComponentNameText.getText();
-	}
-
-	public String getDSImplementationClassValue() {
-		return fDSImplementationClassText.getText();
-	}
-
-	private boolean checkPageComplete() {
-		if (fDSComponentNameText == null || fDSImplementationClassText == null) {
-			return false;
-		}
-		return fDSComponentNameText.getText().length() > 0
-				&& fDSImplementationClassText.getText().length() > 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ui.dialogs.WizardNewFileCreationPage#validateLinkedResource()
-	 */
-	protected IStatus validateLinkedResource() {
-		return new Status(IStatus.OK, Activator.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
-	}
-
-	protected void createLinkTarget() {
-		// NO-OP
-	}
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Dialog.applyDialogFont(fGroup);
-	}
-
-	public boolean isPageComplete() {
-		return checkPageComplete() && validatePage();
-	}
-
-	public void saveSettings(IDialogSettings settings) {
-		settings.put(S_COMPONENT_NAME, getFileName());
-	}
-
-	protected boolean validatePage() {
-		if (fDSImplementationClassText != null) {
-			IStatus status = ResourcesPlugin.getWorkspace().validateName(
-					fDSImplementationClassText.getText(), IResource.FILE);
-			if (!status.isOK()) {
-				setErrorMessage(status.getMessage());
-				return false;
-			}
-		}
-		return super.validatePage();
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewClassCreationWizard.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewClassCreationWizard.java
deleted file mode 100644
index 8e86c14..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewClassCreationWizard.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.pde.internal.ui.editor.schema.NewClassCreationWizard;
-
-public class DSNewClassCreationWizard extends NewClassCreationWizard {
-
-	public DSNewClassCreationWizard(IProject project, boolean isInterface,
-			String value) {
-		super(project, isInterface, value);
-	}
-
-}

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewWizard.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewWizard.java
deleted file mode 100644
index a672070..0000000
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/wizards/DSNewWizard.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Chris Aniszczyk <caniszczyk@gmail.com>
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
- *******************************************************************************/
-package org.eclipse.pde.internal.ds.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.internal.ds.ui.Activator;
-import org.eclipse.pde.internal.ds.ui.Messages;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class DSNewWizard extends Wizard implements INewWizard {
-	protected DSFileWizardPage fMainPage;
-
-	public DSNewWizard() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#addPages()
-	 */
-	public void addPages() {
-		 addPage(fMainPage);
-	}
-	
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		setWindowTitle(Messages.DSNewWizard_title);
-		setDialogSettings(Activator.getDefault().getDialogSettings());
-		fMainPage = new DSFileWizardPage(currentSelection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			IDialogSettings settings = getDialogSettings();
-			if (settings != null) {
-				fMainPage.saveSettings(settings);
-			}
-			IRunnableWithProgress op = new DSCreationOperation(fMainPage
-					.createNewFile(), fMainPage.getDSComponentNameValue(),
-					fMainPage.getDSImplementationClassValue());
-
-			getContainer().run(false, true, op);
-		} catch (InvocationTargetException e) {
-			Activator.logException(e, null, null);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/.classpath b/ua/org.eclipse.pde.ua.core/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/ua/org.eclipse.pde.ua.core/.classpath
+++ /dev/null

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

diff --git a/ua/org.eclipse.pde.ua.core/.cvsignore b/ua/org.eclipse.pde.ua.core/.cvsignore
deleted file mode 100644
index 3aef9b8..0000000
--- a/ua/org.eclipse.pde.ua.core/.cvsignore
+++ /dev/null

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

diff --git a/ua/org.eclipse.pde.ua.core/.project b/ua/org.eclipse.pde.ua.core/.project
deleted file mode 100644
index d599377..0000000
--- a/ua/org.eclipse.pde.ua.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.ua.core</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.core.resources.prefs b/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 1a4cdbd..0000000
--- a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Fri Oct 20 13:22:13 EDT 2006
-eclipse.preferences.version=1
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/default.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/implied.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/osname.aliases=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases=UTF-8
-encoding/<project>=ISO-8859-1

diff --git a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a6347d0..0000000
--- a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,330 +0,0 @@
-#Wed Jan 21 13:36:27 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-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.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-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.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.ui.prefs b/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index be91640..0000000
--- a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,113 +0,0 @@
-#Wed Jan 21 21:41:10 CET 2009
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.ondemandthreshold=5
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.core.prefs b/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.core.prefs
deleted file mode 100755
index a3a0809..0000000
--- a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Wed Mar 29 00:38:44 EST 2006
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.pde.core/binary

diff --git a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.prefs b/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 2a93f67..0000000
--- a/ua/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,22 +0,0 @@
-#Mon May 19 20:20:15 CDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1

diff --git a/ua/org.eclipse.pde.ua.core/META-INF/MANIFEST.MF b/ua/org.eclipse.pde.ua.core/META-INF/MANIFEST.MF
deleted file mode 100644
index ebbfc53..0000000
--- a/ua/org.eclipse.pde.ua.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde.ua.core;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.pde.internal.ua.core.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.text;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.pde.internal.ua.core;x-internal:=true,
- org.eclipse.pde.internal.ua.core.cheatsheet.comp;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.cheatsheet.simple;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.ctxhelp;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.ctxhelp.text;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.icheatsheet;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.icheatsheet.comp;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.toc;x-friends:="org.eclipse.pde.ua.ui",
- org.eclipse.pde.internal.ua.core.toc.text;x-friends:="org.eclipse.pde.ua.ui"

diff --git a/ua/org.eclipse.pde.ua.core/about.html b/ua/org.eclipse.pde.ua.core/about.html
deleted file mode 100644
index 4602330..0000000
--- a/ua/org.eclipse.pde.ua.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ua/org.eclipse.pde.ua.core/build.properties b/ua/org.eclipse.pde.ua.core/build.properties
deleted file mode 100644
index 1dde0d2..0000000
--- a/ua/org.eclipse.pde.ua.core/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html,\
-               plugin.xml
-src.includes = about.html

diff --git a/ua/org.eclipse.pde.ua.core/plugin.properties b/ua/org.eclipse.pde.ua.core/plugin.properties
deleted file mode 100644
index 93853ec..0000000
--- a/ua/org.eclipse.pde.ua.core/plugin.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-#Properties file for org.eclipse.pde.ua.core
-pluginName = PDE UA Core
-providerName = Eclipse.org
-
-content-type.name.simpleCS = Simple Cheat Sheet File
-content-type.name.compCS = Composite Cheat Sheet File
-
-content-type.name.toc = Table of Contents File
-content-type.name.ctxHelp = Context Help File
\ No newline at end of file

diff --git a/ua/org.eclipse.pde.ua.core/plugin.xml b/ua/org.eclipse.pde.ua.core/plugin.xml
deleted file mode 100644
index edcd7f4..0000000
--- a/ua/org.eclipse.pde.ua.core/plugin.xml
+++ /dev/null

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-         <content-type
-            base-type="org.eclipse.core.runtime.xml"
-            file-extensions="xml"
-            id="org.eclipse.pde.simpleCheatSheet"
-            name="%content-type.name.simpleCS"
-            priority="high">
-         <describer
-               class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber">
-            <parameter
-                  name="element"
-                  value="cheatsheet">
-            </parameter>
-         </describer>
-      </content-type>
-      <content-type
-            base-type="org.eclipse.core.runtime.xml"
-            file-extensions="xml"
-            id="org.eclipse.pde.compositeCheatSheet"
-            name="%content-type.name.compCS"
-            priority="high">
-         <describer
-               class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber">
-            <parameter
-                  name="element"
-                  value="compositeCheatsheet">
-            </parameter>
-         </describer>
-      </content-type>
-      <content-type
-            base-type="org.eclipse.core.runtime.xml"
-            file-extensions="xml"
-            id="org.eclipse.pde.tocFile"
-            name="%content-type.name.toc"
-            priority="high">
-         <describer
-               class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber">
-            <parameter
-                  name="element"
-                  value="toc">
-            </parameter>
-         </describer>
-      </content-type>
-      <content-type
-            base-type="org.eclipse.core.runtime.xml"
-            file-extensions="xml"
-            id="org.eclipse.pde.ctxHelpFile"
-            name="%content-type.name.ctxHelp"
-            priority="high">
-         <describer
-               class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber">
-            <parameter
-                  name="element"
-                  value="contexts">
-            </parameter>
-         </describer>
-      </content-type>
-   </extension>
-
-</plugin>

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/Activator.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/Activator.java
deleted file mode 100644
index bae4627..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/Activator.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.pde.ua.core";
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/CheatSheetUtil.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/CheatSheetUtil.java
deleted file mode 100644
index 42b7ede..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/CheatSheetUtil.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-public class CheatSheetUtil {
-
-	/**
-	 * Recursively finds and accumulates all element's text and element children
-	 * into a String in raw XML form
-	 * 
-	 * @param element
-	 * @return
-	 */
-	public static String parseElementText(Element element) {
-		// Puts all Text nodes in the full depth of the sub-tree
-		// underneath this Node
-		// i.e., there are neither adjacent Text nodes nor empty Text nodes.
-		element.normalize();
-		// Process only if there are children
-		if (element.getChildNodes().getLength() > 0) {
-			NodeList children = element.getChildNodes();
-			StringBuffer buffer = new StringBuffer();
-			// Traverse over each childe
-			for (int i = 0; i < children.getLength(); i++) {
-				Node node = children.item(i);
-				if (node.getNodeType() == Node.TEXT_NODE) {
-					// Accumulate the text children
-					buffer.append(((Text) node).getData());
-				} else if (node.getNodeType() == Node.ELEMENT_NODE) {
-					Element subElement = (Element) node;
-					// Append the open bracket
-					buffer.append('<');
-					// Append the element name
-					buffer.append(subElement.getNodeName());
-					// Parse element attributes
-					String elementAttributeText = parseElementAttributes(subElement);
-					// Append the attributes (if any)
-					if (elementAttributeText != null) {
-						buffer.append(elementAttributeText);
-					}
-					// Recursively accumulate element children
-					String value = parseElementText(subElement);
-					// Determine whether the element has any content or not
-					if (value.length() > 0) {
-						// The element had children
-						// Enclose the accumulated children with start and end
-						// tags
-						// Close off start element
-						buffer.append('>');
-						// Append element content
-						buffer.append(value);
-						// Append open bracket for end element tag
-						buffer.append('<');
-						buffer.append('/');
-						buffer.append(subElement.getNodeName());
-					} else {
-						// The element had no children
-						// Generate an abbreviated element tag
-						buffer.append('/');
-					}
-					// Append the close bracket
-					buffer.append('>');
-				}
-			}
-			// Return all accumulated children under the input element as a raw
-			// XML string
-			return buffer.toString();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Aggregates all attributes from the given element, formats then into the
-	 * proper key="value" XML format and returns them as one String
-	 * 
-	 * @param element
-	 * @return The formatted String or null if the element has no attributes
-	 */
-	private static String parseElementAttributes(Element element) {
-		// Verify we have attributes
-		if (element.hasAttributes() == false) {
-			return null;
-		}
-		// Create the buffer
-		StringBuffer buffer = new StringBuffer();
-		// Get the attributes
-		NamedNodeMap attributeMap = element.getAttributes();
-		// Accumulate all attributes
-		for (int i = 0; i < attributeMap.getLength(); i++) {
-			Node node = attributeMap.item(i);
-			if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-				Attr attribute = (Attr) node;
-				// Append space before attribute
-				buffer.append(' ');
-				// Append attribute name
-				buffer.append(attribute.getName());
-				// Append =
-				buffer.append('=');
-				// Append quote
-				buffer.append('"');
-				// Append attribute value
-				buffer.append(attribute.getValue());
-				// Append quote
-				buffer.append('"');
-			}
-		}
-
-		return buffer.toString();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCS.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCS.java
deleted file mode 100644
index 2d54df9..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCS.java
+++ /dev/null

@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * CompCS
- * 
- */
-public class CompCS extends CompCSObject implements ICompCS {
-
-	private String fFieldName;
-
-	private ICompCSTaskObject fFieldTaskObject;
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public CompCS(ICompCSModel model) {
-		super(model, null);
-		reset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getChildren()
-	 */
-	public List getChildren() {
-		ArrayList list = new ArrayList();
-		// Add task / taskGroup
-		if (fFieldTaskObject != null) {
-			list.add(fFieldTaskObject);
-		}
-		return list;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getName()
-	 */
-	public String getName() {
-		return fFieldName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_COMPOSITE_CHEATSHEET;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseAttributes
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseAttributes(Element element) {
-		// Process name attribute
-		// Trim leading and trailing whitespace
-		fFieldName = element.getAttribute(ATTRIBUTE_NAME).trim();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseElement
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseElement(Element element) {
-		String name = element.getNodeName();
-		ICompCSModelFactory factory = getModel().getFactory();
-
-		if (name.equals(ELEMENT_TASK)) {
-			// Process task element
-			fFieldTaskObject = factory.createCompCSTask(this);
-			fFieldTaskObject.parse(element);
-		} else if (name.equals(ELEMENT_TASKGROUP)) {
-			// Process taskGroup element
-			fFieldTaskObject = factory.createCompCSTaskGroup(this);
-			fFieldTaskObject.parse(element);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#reset()
-	 */
-	public void reset() {
-		fFieldName = null;
-		fFieldTaskObject = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#write(java
-	 * .lang.String, java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-
-		try {
-			// Print XML decl
-			XMLPrintHandler.printHead(writer, ATTRIBUTE_VALUE_ENCODING);
-			super.write(indent, writer);
-		} catch (IOException e) {
-			// Suppress
-			// e.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeAttributes
-	 * (java.lang.StringBuffer)
-	 */
-	protected void writeAttributes(StringBuffer buffer) {
-		// Print name attribute
-		if ((fFieldName != null) && (fFieldName.length() > 0)) {
-			// Trim leading and trailing whitespace
-			// Encode characters
-			buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_NAME,
-					PDETextHelper.translateWriteText(fFieldName.trim(),
-							DEFAULT_SUBSTITUTE_CHARS)));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeElements
-	 * (java.lang.String, java.io.PrintWriter)
-	 */
-	protected void writeElements(String indent, PrintWriter writer) {
-		String newIndent = indent + XMLPrintHandler.XML_INDENT;
-		// Print task / taskGroup element
-		if (fFieldTaskObject != null) {
-			fFieldTaskObject.write(newIndent, writer);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS#getFieldName()
-	 */
-	public String getFieldName() {
-		return fFieldName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS#getFieldTaskObject
-	 * ()
-	 */
-	public ICompCSTaskObject getFieldTaskObject() {
-		return fFieldTaskObject;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS#setFieldName(java
-	 * .lang.String)
-	 */
-	public void setFieldName(String name) {
-		String old = fFieldName;
-		fFieldName = name;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_NAME, old, fFieldName);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS#setFieldTaskObject
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public void setFieldTaskObject(ICompCSTaskObject taskObject) {
-		ICompCSObject old = fFieldTaskObject;
-		fFieldTaskObject = taskObject;
-		if (isEditable()) {
-			fireStructureChanged(fFieldTaskObject, old);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getElement()
-	 */
-	public String getElement() {
-		return ELEMENT_COMPOSITE_CHEATSHEET;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseText(
-	 * org.w3c.dom.Text)
-	 */
-	protected void parseText(Text text) {
-		// NO-OP
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDataObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDataObject.java
deleted file mode 100644
index 4066db2..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDataObject.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.CheatSheetUtil;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDataObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public abstract class CompCSDataObject extends CompCSObject implements
-		ICompCSDataObject {
-
-	private static final long serialVersionUID = 1L;
-	private String fFieldContent;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSDataObject(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		// Reset called by child class
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getElement()
-	 */
-	public abstract String getElement();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getName()
-	 */
-	public String getName() {
-		return fFieldContent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getType()
-	 */
-	public abstract int getType();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseContent
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseContent(Element element) {
-		// Override to handle unusual mixed content as in this case
-		// Trim leading and trailing whitespace
-		fFieldContent = CheatSheetUtil.parseElementText(element).trim();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseAttributes
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseAttributes(Element element) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseElement
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseElement(Element element) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseText(
-	 * org.w3c.dom.Text)
-	 */
-	protected void parseText(Text text) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#reset()
-	 */
-	public void reset() {
-		fFieldContent = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeAttributes
-	 * (java.lang.StringBuffer)
-	 */
-	protected void writeAttributes(StringBuffer buffer) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeElements
-	 * (java.lang.String, java.io.PrintWriter)
-	 */
-	protected void writeElements(String indent, PrintWriter writer) {
-		String newIndent = indent + XMLPrintHandler.XML_INDENT;
-		// Print contents
-		if ((fFieldContent != null) && (fFieldContent.length() > 0)) {
-			// Trim leading and trailing whitespace
-			// Encode characters
-			// Preserve tag exceptions
-			writer.write(newIndent
-					+ PDETextHelper.translateWriteText(fFieldContent.trim(),
-							DEFAULT_TAG_EXCEPTIONS, DEFAULT_SUBSTITUTE_CHARS)
-					+ "\n"); //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDataObject#
-	 * getFieldContent()
-	 */
-	public String getFieldContent() {
-		return fFieldContent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDataObject#
-	 * setFieldContent(java.lang.String)
-	 */
-	public void setFieldContent(String content) {
-		String old = fFieldContent;
-		fFieldContent = content;
-		if (isEditable()) {
-			firePropertyChanged(getElement(), old, fFieldContent);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDependency.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDependency.java
deleted file mode 100644
index 4d8452f..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSDependency.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDependency;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class CompCSDependency extends CompCSObject implements ICompCSDependency {
-
-	private String fFieldTask;
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSDependency(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		reset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getElement()
-	 */
-	public String getElement() {
-		return ELEMENT_DEPENDENCY;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getName()
-	 */
-	public String getName() {
-		return fFieldTask;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_DEPENDENCY;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseAttributes
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseAttributes(Element element) {
-		// Process task attribute
-		// Trim leading and trailing whitespace
-		fFieldTask = element.getAttribute(ATTRIBUTE_TASK).trim();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseElement
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseElement(Element element) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#reset()
-	 */
-	public void reset() {
-		fFieldTask = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeAttributes
-	 * (java.lang.StringBuffer)
-	 */
-	protected void writeAttributes(StringBuffer buffer) {
-		// Print task attribute
-		if ((fFieldTask != null) && (fFieldTask.length() > 0)) {
-			// Trim leading and trailing whitespace
-			// Encode characters
-			buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_TASK,
-					PDETextHelper.translateWriteText(fFieldTask.trim(),
-							DEFAULT_SUBSTITUTE_CHARS)));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeElements
-	 * (java.lang.String, java.io.PrintWriter)
-	 */
-	protected void writeElements(String indent, PrintWriter writer) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDependency#getFieldTask
-	 * ()
-	 */
-	public String getFieldTask() {
-		return fFieldTask;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDependency#setFieldTask
-	 * (java.lang.String)
-	 */
-	public void setFieldTask(String task) {
-		String old = fFieldTask;
-		fFieldTask = task;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_TASK, old, fFieldTask);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseText(
-	 * org.w3c.dom.Text)
-	 */
-	protected void parseText(Text text) {
-		// NO-OP
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSIntro.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSIntro.java
deleted file mode 100644
index 600245f..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSIntro.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSIntro;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-
-public class CompCSIntro extends CompCSDataObject implements ICompCSIntro {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSIntro(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		reset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSDataObject#getElement
-	 * ()
-	 */
-	public String getElement() {
-		return ELEMENT_INTRO;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSDataObject#getType()
-	 */
-	public int getType() {
-		return TYPE_INTRO;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModel.java
deleted file mode 100644
index 2905b71..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModel.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.parsers.SAXParser;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.ModelChangedEvent;
-import org.eclipse.pde.internal.core.AbstractModel;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.XMLDefaultHandler;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class CompCSModel extends AbstractModel implements ICompCSModel {
-
-	private ICompCSModelFactory fFactory;
-
-	private ICompCS fCompCS;
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 
-	 */
-	public CompCSModel() {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.AbstractModel#updateTimeStamp()
-	 */
-	protected void updateTimeStamp() {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel#getCompCS()
-	 */
-	public ICompCS getCompCS() {
-		if (fCompCS == null) {
-			fCompCS = getFactory().createCompCS();
-		}
-		return fCompCS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel#getFactory()
-	 */
-	public ICompCSModelFactory getFactory() {
-		if (fFactory == null) {
-			fFactory = new CompCSModelFactory(this);
-		}
-		return fFactory;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IModel#isInSync()
-	 */
-	public boolean isInSync() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IModel#load()
-	 */
-	public void load() throws CoreException {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IModel#load(java.io.InputStream, boolean)
-	 */
-	public void load(InputStream source, boolean outOfSync)
-			throws CoreException {
-
-		try {
-			SAXParser parser = getSaxParser();
-			XMLDefaultHandler handler = new XMLDefaultHandler();
-			parser.parse(source, handler);
-			if (handler.isPrepared()) {
-				processDocument(handler.getDocument());
-				setLoaded(true);
-			}
-		} catch (Exception e) {
-			setException(e);
-			PDECore.logException(e);
-		} finally {
-			try {
-				if (source != null) {
-					source.close();
-				}
-			} catch (IOException e) {
-				// Ignore
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IModel#reload(java.io.InputStream, boolean)
-	 */
-	public void reload(InputStream source, boolean outOfSync)
-			throws CoreException {
-
-		load(source, outOfSync);
-		fireModelChanged(new ModelChangedEvent(this,
-				IModelChangedEvent.WORLD_CHANGED, new Object[] { fCompCS },
-				null));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IBaseModel#isEditable()
-	 */
-	public boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @param doc
-	 */
-	private void processDocument(Document doc) {
-		Element rootNode = doc.getDocumentElement();
-		if (fCompCS == null) {
-			fCompCS = getFactory().createCompCS();
-		} else {
-			fCompCS.reset();
-		}
-		fCompCS.parse(rootNode);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java
deleted file mode 100644
index d82d986..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSModelFactory.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDependency;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSIntro;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSOnCompletion;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-
-public class CompCSModelFactory implements ICompCSModelFactory {
-
-	private ICompCSModel fModel;
-
-	/**
-	 * @param model
-	 */
-	public CompCSModelFactory(ICompCSModel model) {
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory#
-	 * createCompCS()
-	 */
-	public ICompCS createCompCS() {
-		return new CompCS(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory#
-	 * createCompCSDependency
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject)
-	 */
-	public ICompCSDependency createCompCSDependency(ICompCSObject parent) {
-		return new CompCSDependency(fModel, parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory#
-	 * createCompCSIntro
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject)
-	 */
-	public ICompCSIntro createCompCSIntro(ICompCSObject parent) {
-		return new CompCSIntro(fModel, parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory#
-	 * createCompCSOnCompletion
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject)
-	 */
-	public ICompCSOnCompletion createCompCSOnCompletion(ICompCSObject parent) {
-		return new CompCSOnCompletion(fModel, parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory#
-	 * createCompCSParam
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject)
-	 */
-	public ICompCSParam createCompCSParam(ICompCSObject parent) {
-		return new CompCSParam(fModel, parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory#
-	 * createCompCSTask
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject)
-	 */
-	public ICompCSTask createCompCSTask(ICompCSObject parent) {
-		return new CompCSTask(fModel, parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory#
-	 * createCompCSTaskGroup
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject)
-	 */
-	public ICompCSTaskGroup createCompCSTaskGroup(ICompCSObject parent) {
-		return new CompCSTaskGroup(fModel, parent);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSObject.java
deleted file mode 100644
index 23ba577..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSObject.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.pde.core.IModelChangeProvider;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.ModelChangedEvent;
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-public abstract class CompCSObject extends PlatformObject implements
-		ICompCSObject {
-
-	private static final long serialVersionUID = 1L;
-
-	private transient ICompCSModel fModel;
-
-	private transient ICompCSObject fParent;
-
-	protected static final HashSet DEFAULT_TAG_EXCEPTIONS = new HashSet(12);
-
-	protected static final HashMap DEFAULT_SUBSTITUTE_CHARS = new HashMap(5);
-
-	static {
-		DEFAULT_TAG_EXCEPTIONS.add("b"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("/b"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("br/"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("p"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("/p"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("li"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("/li"); //$NON-NLS-1$		
-		DEFAULT_TAG_EXCEPTIONS.add("a"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("/a"); //$NON-NLS-1$	
-		DEFAULT_TAG_EXCEPTIONS.add("span"); //$NON-NLS-1$
-		DEFAULT_TAG_EXCEPTIONS.add("/span"); //$NON-NLS-1$			
-		DEFAULT_TAG_EXCEPTIONS.add("img"); //$NON-NLS-1$	
-
-		DEFAULT_SUBSTITUTE_CHARS.put(new Character('&'), "&amp;"); //$NON-NLS-1$
-		DEFAULT_SUBSTITUTE_CHARS.put(new Character('<'), "&lt;"); //$NON-NLS-1$
-		DEFAULT_SUBSTITUTE_CHARS.put(new Character('>'), "&gt;"); //$NON-NLS-1$
-		DEFAULT_SUBSTITUTE_CHARS.put(new Character('\''), "&apos;"); //$NON-NLS-1$
-		DEFAULT_SUBSTITUTE_CHARS.put(new Character('\"'), "&quot;"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSObject(ICompCSModel model, ICompCSObject parent) {
-		fModel = model;
-		fParent = parent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getChildren
-	 * ()
-	 */
-	public abstract List getChildren();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getCompCS()
-	 */
-	public ICompCS getCompCS() {
-		return fModel.getCompCS();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getModel()
-	 */
-	public ICompCSModel getModel() {
-		return fModel;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getName()
-	 */
-	public abstract String getName();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getParent()
-	 */
-	public ICompCSObject getParent() {
-		return fParent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getType()
-	 */
-	public abstract int getType();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#parse(org
-	 * .w3c.dom.Element)
-	 */
-	public void parse(Element element) {
-		if (element.getNodeName().equals(getElement())) {
-			parseAttributes(element);
-			parseContent(element);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#reset()
-	 */
-	public abstract void reset();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#setModel
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel)
-	 */
-	public void setModel(ICompCSModel model) {
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String,
-	 * java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-
-		StringBuffer buffer = new StringBuffer();
-		try {
-			// Assemble start element
-			buffer.append(getElement());
-			// Assemble attributes
-			writeAttributes(buffer);
-			// Print start element and attributes
-			XMLPrintHandler.printBeginElement(writer, buffer.toString(),
-					indent, false);
-			// Print elements
-			writeElements(indent, writer);
-			// Print end element
-			XMLPrintHandler.printEndElement(writer, getElement(), indent);
-		} catch (IOException e) {
-			// Suppress
-			// e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @param property
-	 * @param oldValue
-	 * @param newValue
-	 */
-	protected void firePropertyChanged(String property, Object oldValue,
-			Object newValue) {
-		firePropertyChanged(this, property, oldValue, newValue);
-	}
-
-	/**
-	 * @param object
-	 * @param property
-	 * @param oldValue
-	 * @param newValue
-	 */
-	private void firePropertyChanged(ICompCSObject object, String property,
-			Object oldValue, Object newValue) {
-		if (fModel.isEditable()) {
-			IModelChangeProvider provider = fModel;
-			provider.fireModelObjectChanged(object, property, oldValue,
-					newValue);
-		}
-	}
-
-	/**
-	 * @param child
-	 * @param changeType
-	 */
-	protected void fireStructureChanged(ICompCSObject child, int changeType) {
-		fireStructureChanged(new ICompCSObject[] { child }, changeType);
-	}
-
-	/**
-	 * @param newValue
-	 * @param oldValue
-	 * @param changeType
-	 */
-	protected void fireStructureChanged(ICompCSObject newValue,
-			ICompCSObject oldValue) {
-
-		int changeType = -1;
-		ICompCSObject object = null;
-		if (newValue == null) {
-			changeType = IModelChangedEvent.REMOVE;
-			object = oldValue;
-		} else {
-			changeType = IModelChangedEvent.INSERT;
-			object = newValue;
-		}
-		fireStructureChanged(object, changeType);
-	}
-
-	/**
-	 * @param children
-	 * @param changeType
-	 */
-	private void fireStructureChanged(ICompCSObject[] children, int changeType) {
-		if (fModel.isEditable()) {
-			IModelChangeProvider provider = fModel;
-			provider.fireModelChanged(new ModelChangedEvent(provider,
-					changeType, children, null));
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isEditable() {
-		return getModel().isEditable();
-	}
-
-	/**
-	 * @param element
-	 */
-	protected abstract void parseAttributes(Element element);
-
-	/**
-	 * @param element
-	 */
-	protected void parseContent(Element element) {
-		// Process children
-		NodeList children = element.getChildNodes();
-		for (int i = 0; i < children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child.getNodeType() == Node.ELEMENT_NODE) {
-				parseElement((Element) child);
-			} else if (child.getNodeType() == Node.TEXT_NODE) {
-				parseText((Text) child);
-			}
-		}
-	}
-
-	/**
-	 * @param element
-	 */
-	protected abstract void parseElement(Element element);
-
-	/**
-	 * @param element
-	 */
-	protected abstract void parseText(Text text);
-
-	/**
-	 * @param buffer
-	 */
-	protected abstract void writeAttributes(StringBuffer buffer);
-
-	/**
-	 * Writes child elements or child content
-	 * 
-	 * @param indent
-	 * @param writer
-	 */
-	protected abstract void writeElements(String indent, PrintWriter writer);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject#getElement()
-	 */
-	public abstract String getElement();
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSOnCompletion.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSOnCompletion.java
deleted file mode 100644
index d7397db..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSOnCompletion.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSOnCompletion;
-
-public class CompCSOnCompletion extends CompCSDataObject implements
-		ICompCSOnCompletion {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSOnCompletion(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		reset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSDataObject#getElement
-	 * ()
-	 */
-	public String getElement() {
-		return ELEMENT_ONCOMPLETION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSDataObject#getType()
-	 */
-	public int getType() {
-		return TYPE_ONCOMPLETION;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSParam.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSParam.java
deleted file mode 100644
index 80c14df..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSParam.java
+++ /dev/null

@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class CompCSParam extends CompCSObject implements ICompCSParam {
-
-	private String fFieldName;
-
-	private String fFieldValue;
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSParam(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		reset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getElement()
-	 */
-	public String getElement() {
-		return ELEMENT_PARAM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getName()
-	 */
-	public String getName() {
-		return fFieldName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getType()
-	 */
-	public int getType() {
-		return TYPE_PARAM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseAttributes
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseAttributes(Element element) {
-		// Process name attribute
-		// Trim leading and trailing whitespace
-		fFieldName = element.getAttribute(ATTRIBUTE_NAME).trim();
-		// Process value attribute
-		// Trim leading and trailing whitespace
-		fFieldValue = element.getAttribute(ATTRIBUTE_VALUE).trim();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseElement
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseElement(Element element) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#reset()
-	 */
-	public void reset() {
-		fFieldName = null;
-		fFieldValue = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeAttributes
-	 * (java.lang.StringBuffer)
-	 */
-	protected void writeAttributes(StringBuffer buffer) {
-		// Print name attribute
-		if ((fFieldName != null) && (fFieldName.length() > 0)) {
-			// No trim required
-			// No encode required
-			buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_NAME,
-					fFieldName));
-		}
-		// Print value attribute
-		if ((fFieldValue != null) && (fFieldValue.length() > 0)) {
-			// Trim leading and trailing whitespace
-			// Encode characters
-			buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_VALUE,
-					PDETextHelper.translateWriteText(fFieldValue.trim(),
-							DEFAULT_SUBSTITUTE_CHARS)));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeElements
-	 * (java.lang.String, java.io.PrintWriter)
-	 */
-	protected void writeElements(String indent, PrintWriter writer) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam#getFieldName
-	 * ()
-	 */
-	public String getFieldName() {
-		return fFieldName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam#getFieldValue
-	 * ()
-	 */
-	public String getFieldValue() {
-		return fFieldValue;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam#setFieldName
-	 * (java.lang.String)
-	 */
-	public void setFieldName(String name) {
-		String old = fFieldName;
-		fFieldName = name;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_NAME, old, fFieldName);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam#setFieldValue
-	 * (java.lang.String)
-	 */
-	public void setFieldValue(String value) {
-		String old = fFieldValue;
-		fFieldValue = value;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_VALUE, old, fFieldValue);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseText(
-	 * org.w3c.dom.Text)
-	 */
-	protected void parseText(Text text) {
-		// NO-OP
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTask.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTask.java
deleted file mode 100644
index 0163bc1..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTask.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask;
-import org.w3c.dom.Element;
-
-public class CompCSTask extends CompCSTaskObject implements ICompCSTask {
-
-	private ArrayList fFieldParams;
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSTask(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		reset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#getChildren
-	 * ()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#getName()
-	 */
-	public String getName() {
-		return fFieldName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#getType()
-	 */
-	public int getType() {
-		return TYPE_TASK;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getElement()
-	 */
-	public String getElement() {
-		return ELEMENT_TASK;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseElement
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseElement(Element element) {
-		super.parseElement(element);
-		String name = element.getNodeName();
-		ICompCSModelFactory factory = getModel().getFactory();
-
-		if (name.equals(ELEMENT_PARAM)) {
-			// Process param element
-			ICompCSParam param = factory.createCompCSParam(this);
-			fFieldParams.add(param);
-			param.parse(element);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask#addFieldParam
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam)
-	 */
-	public void addFieldParam(ICompCSParam param) {
-		fFieldParams.add(param);
-		if (isEditable()) {
-			fireStructureChanged(param, IModelChangedEvent.INSERT);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask#getFieldParams
-	 * ()
-	 */
-	public ICompCSParam[] getFieldParams() {
-		return (ICompCSParam[]) fFieldParams
-				.toArray(new ICompCSParam[fFieldParams.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask#removeFieldParam
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam)
-	 */
-	public void removeFieldParam(ICompCSParam param) {
-		fFieldParams.remove(param);
-		if (isEditable()) {
-			fireStructureChanged(param, IModelChangedEvent.REMOVE);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#reset()
-	 */
-	public void reset() {
-		super.reset();
-
-		fFieldParams = new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#writeElements
-	 * (java.lang.String, java.io.PrintWriter)
-	 */
-	protected void writeElements(String indent, PrintWriter writer) {
-		super.writeElements(indent, writer);
-		String newIndent = indent + XMLPrintHandler.XML_INDENT;
-		// Print param elements
-		Iterator iterator = fFieldParams.iterator();
-		while (iterator.hasNext()) {
-			ICompCSParam param = (ICompCSParam) iterator.next();
-			param.write(newIndent, writer);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask#hasFieldParams
-	 * ()
-	 */
-	public boolean hasFieldParams() {
-		if (fFieldParams.isEmpty()) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask#getFieldParam
-	 * (java.lang.String)
-	 */
-	public ICompCSParam getFieldParam(String name) {
-		if (fFieldParams.isEmpty()) {
-			return null;
-		}
-		ListIterator iterator = fFieldParams.listIterator();
-		while (iterator.hasNext()) {
-			ICompCSParam parameter = (ICompCSParam) iterator.next();
-			if (parameter.getFieldName().equals(name)) {
-				return parameter;
-			}
-		}
-		return null;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskGroup.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskGroup.java
deleted file mode 100644
index ecf33a2..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskGroup.java
+++ /dev/null

@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-import org.w3c.dom.Element;
-
-public class CompCSTaskGroup extends CompCSTaskObject implements
-		ICompCSTaskGroup {
-
-	private ArrayList fFieldTaskObjects;
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSTaskGroup(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		reset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#getChildren
-	 * ()
-	 */
-	public List getChildren() {
-		ArrayList list = new ArrayList();
-		// Add task objects
-		if (fFieldTaskObjects.size() > 0) {
-			list.addAll(fFieldTaskObjects);
-		}
-		return list;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#getName()
-	 */
-	public String getName() {
-		return fFieldName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#getType()
-	 */
-	public int getType() {
-		return TYPE_TASKGROUP;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#reset()
-	 */
-	public void reset() {
-		super.reset();
-
-		fFieldTaskObjects = new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * addFieldTaskObject
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public void addFieldTaskObject(ICompCSTaskObject taskObject) {
-		fFieldTaskObjects.add(taskObject);
-		if (isEditable()) {
-			fireStructureChanged(taskObject, IModelChangedEvent.INSERT);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * addFieldTaskObject(int,
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public void addFieldTaskObject(int index, ICompCSTaskObject taskObject) {
-		if (index < 0) {
-			return;
-		}
-		if (index >= fFieldTaskObjects.size()) {
-			fFieldTaskObjects.add(taskObject);
-		} else {
-			fFieldTaskObjects.add(index, taskObject);
-		}
-
-		if (isEditable()) {
-			fireStructureChanged(taskObject, IModelChangedEvent.INSERT);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * getFieldTaskObjectCount()
-	 */
-	public int getFieldTaskObjectCount() {
-		return fFieldTaskObjects.size();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * getFieldTaskObjects()
-	 */
-	public ICompCSTaskObject[] getFieldTaskObjects() {
-		return (ICompCSTaskObject[]) fFieldTaskObjects
-				.toArray(new ICompCSTaskObject[fFieldTaskObjects.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * hasFieldTaskObjects()
-	 */
-	public boolean hasFieldTaskObjects() {
-		if (fFieldTaskObjects.isEmpty()) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * indexOfFieldTaskObject
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public int indexOfFieldTaskObject(ICompCSTaskObject taskObject) {
-		return fFieldTaskObjects.indexOf(taskObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * isFirstFieldTaskObject
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public boolean isFirstFieldTaskObject(ICompCSTaskObject taskObject) {
-		int position = fFieldTaskObjects.indexOf(taskObject);
-		if (position == 0) {
-			return true;
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * isLastFieldTaskObject
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public boolean isLastFieldTaskObject(ICompCSTaskObject taskObject) {
-		int position = fFieldTaskObjects.indexOf(taskObject);
-		int lastPosition = fFieldTaskObjects.size() - 1;
-		if (position == lastPosition) {
-			return true;
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * removeFieldTaskObject
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public void removeFieldTaskObject(ICompCSTaskObject taskObject) {
-		fFieldTaskObjects.remove(taskObject);
-		if (isEditable()) {
-			fireStructureChanged(taskObject, IModelChangedEvent.REMOVE);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * removeFieldTaskObject(int)
-	 */
-	public void removeFieldTaskObject(int index) {
-		if ((index < 0) || (index > (fFieldTaskObjects.size() - 1))) {
-			return;
-		}
-		ICompCSTaskObject taskObject = (ICompCSTaskObject) fFieldTaskObjects
-				.remove(index);
-		if (isEditable()) {
-			fireStructureChanged(taskObject, IModelChangedEvent.REMOVE);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseElement
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseElement(Element element) {
-		super.parseElement(element);
-		String name = element.getNodeName();
-		ICompCSModelFactory factory = getModel().getFactory();
-
-		if (name.equals(ELEMENT_TASK)) {
-			// Process task element
-			ICompCSTask task = factory.createCompCSTask(this);
-			fFieldTaskObjects.add(task);
-			task.parse(element);
-		} else if (name.equals(ELEMENT_TASKGROUP)) {
-			// Process taskGroup element
-			ICompCSTaskGroup taskGroup = factory.createCompCSTaskGroup(this);
-			fFieldTaskObjects.add(taskGroup);
-			taskGroup.parse(element);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSTaskObject#writeElements
-	 * (java.lang.String, java.io.PrintWriter)
-	 */
-	protected void writeElements(String indent, PrintWriter writer) {
-		super.writeElements(indent, writer);
-		String newIndent = indent + XMLPrintHandler.XML_INDENT;
-		// Print dependency elements
-		Iterator iterator = fFieldTaskObjects.iterator();
-		while (iterator.hasNext()) {
-			ICompCSTaskObject taskObject = (ICompCSTaskObject) iterator.next();
-			taskObject.write(newIndent, writer);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getElement()
-	 */
-	public String getElement() {
-		return ELEMENT_TASKGROUP;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * getNextSibling
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public ICompCSTaskObject getNextSibling(ICompCSTaskObject taskObject) {
-		int position = fFieldTaskObjects.indexOf(taskObject);
-		int lastIndex = fFieldTaskObjects.size() - 1;
-		if ((position == -1) || (position == lastIndex)) {
-			// Either the item was not found or the item was found but it is
-			// at the last index
-			return null;
-		}
-		return (ICompCSTaskObject) fFieldTaskObjects.get(position + 1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * getPreviousSibling
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject)
-	 */
-	public ICompCSTaskObject getPreviousSibling(ICompCSTaskObject taskObject) {
-		int position = fFieldTaskObjects.indexOf(taskObject);
-		if ((position == -1) || (position == 0)) {
-			// Either the item was not found or the item was found but it is
-			// at the first index
-			return null;
-		}
-		return (ICompCSTaskObject) fFieldTaskObjects.get(position - 1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup#
-	 * moveFieldTaskObject
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject, int)
-	 */
-	public void moveFieldTaskObject(ICompCSTaskObject taskObject,
-			int newRelativeIndex) {
-		// Get the current index of the task object
-		int currentIndex = indexOfFieldTaskObject(taskObject);
-		// Ensure the object is found
-		if (currentIndex == -1) {
-			return;
-		}
-		// Calculate the new index
-		int newIndex = newRelativeIndex + currentIndex;
-		// Validate the new index
-		if ((newIndex < 0) || (newIndex >= fFieldTaskObjects.size())) {
-			return;
-		}
-		// Remove the task object
-		fFieldTaskObjects.remove(taskObject);
-		// Add the task object back at the specified index
-		fFieldTaskObjects.add(newIndex, taskObject);
-		// Send an insert event
-		if (isEditable()) {
-			fireStructureChanged(taskObject, IModelChangedEvent.INSERT);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskObject.java
deleted file mode 100644
index 3fe717c..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSTaskObject.java
+++ /dev/null

@@ -1,422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDependency;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSIntro;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSOnCompletion;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public abstract class CompCSTaskObject extends CompCSObject implements
-		ICompCSTaskObject {
-
-	private static final long serialVersionUID = 1L;
-
-	protected String fFieldId;
-
-	protected String fFieldKind;
-
-	protected ICompCSIntro fFieldIntro;
-
-	protected ICompCSOnCompletion fFieldOnCompletion;
-
-	protected String fFieldName;
-
-	protected boolean fFieldSkip;
-
-	protected ArrayList fFieldDependencies;
-
-	/**
-	 * @param model
-	 * @param parent
-	 */
-	public CompCSTaskObject(ICompCSModel model, ICompCSObject parent) {
-		super(model, parent);
-		// Reset called by child class
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getChildren()
-	 */
-	public abstract List getChildren();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getName()
-	 */
-	public abstract String getName();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getType()
-	 */
-	public abstract int getType();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#reset()
-	 */
-	public void reset() {
-		fFieldId = null;
-		fFieldKind = null;
-		fFieldIntro = null;
-		fFieldOnCompletion = null;
-		fFieldName = null;
-		fFieldSkip = false;
-		fFieldDependencies = new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#
-	 * addFieldDependency
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDependency)
-	 */
-	public void addFieldDependency(ICompCSDependency dependency) {
-		fFieldDependencies.add(dependency);
-		if (isEditable()) {
-			fireStructureChanged(dependency, IModelChangedEvent.INSERT);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#getFieldId
-	 * ()
-	 */
-	public String getFieldId() {
-		return fFieldId;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#
-	 * getFieldIntro()
-	 */
-	public ICompCSIntro getFieldIntro() {
-		return fFieldIntro;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#getFieldKind
-	 * ()
-	 */
-	public String getFieldKind() {
-		return fFieldKind;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#getFieldName
-	 * ()
-	 */
-	public String getFieldName() {
-		return fFieldName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#
-	 * getFieldOnCompletion()
-	 */
-	public ICompCSOnCompletion getFieldOnCompletion() {
-		return fFieldOnCompletion;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#getFieldSkip
-	 * ()
-	 */
-	public boolean getFieldSkip() {
-		return fFieldSkip;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#
-	 * removeFieldDepedency
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSDependency)
-	 */
-	public void removeFieldDepedency(ICompCSDependency dependency) {
-		fFieldDependencies.remove(dependency);
-		if (isEditable()) {
-			fireStructureChanged(dependency, IModelChangedEvent.REMOVE);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#setFieldId
-	 * (java.lang.String)
-	 */
-	public void setFieldId(String id) {
-		String old = fFieldId;
-		fFieldId = id;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_ID, old, fFieldId);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#
-	 * setFieldIntro
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSIntro)
-	 */
-	public void setFieldIntro(ICompCSIntro intro) {
-		ICompCSObject old = fFieldIntro;
-		fFieldIntro = intro;
-		if (isEditable()) {
-			fireStructureChanged(intro, old);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#setFieldKind
-	 * (java.lang.String)
-	 */
-	public void setFieldKind(String kind) {
-		String old = fFieldKind;
-		fFieldKind = kind;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_KIND, old, fFieldKind);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#setFieldName
-	 * (java.lang.String)
-	 */
-	public void setFieldName(String name) {
-		String old = fFieldName;
-		fFieldName = name;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_NAME, old, fFieldName);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#
-	 * setFieldOnCompletion
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSOnCompletion)
-	 */
-	public void setFieldOnCompletion(ICompCSOnCompletion onCompletion) {
-		ICompCSObject old = fFieldOnCompletion;
-		fFieldOnCompletion = onCompletion;
-		if (isEditable()) {
-			fireStructureChanged(onCompletion, old);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#setFieldSkip
-	 * (boolean)
-	 */
-	public void setFieldSkip(boolean skip) {
-		Boolean old = Boolean.valueOf(fFieldSkip);
-		fFieldSkip = skip;
-		if (isEditable()) {
-			firePropertyChanged(ATTRIBUTE_SKIP, old, Boolean
-					.valueOf(fFieldSkip));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject#
-	 * getFieldDependencies()
-	 */
-	public ICompCSDependency[] getFieldDependencies() {
-		return (ICompCSDependency[]) fFieldDependencies
-				.toArray(new ICompCSDependency[fFieldDependencies.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseText(
-	 * org.w3c.dom.Text)
-	 */
-	protected void parseText(Text text) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseAttributes
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseAttributes(Element element) {
-		// Process id attribute
-		// Trim leading and trailing whitespace
-		fFieldId = element.getAttribute(ATTRIBUTE_ID).trim();
-		// Process kind attribute
-		// Trim leading and trailing whitespace
-		fFieldKind = element.getAttribute(ATTRIBUTE_KIND).trim();
-		// Process name attribute
-		// Trim leading and trailing whitespace
-		fFieldName = element.getAttribute(ATTRIBUTE_NAME).trim();
-		// Process skip attribute
-		if (element.getAttribute(ATTRIBUTE_SKIP)
-				.compareTo(ATTRIBUTE_VALUE_TRUE) == 0) {
-			fFieldSkip = true;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeAttributes
-	 * (java.lang.StringBuffer)
-	 */
-	protected void writeAttributes(StringBuffer buffer) {
-		// Print id attribute
-		if ((fFieldId != null) && (fFieldId.length() > 0)) {
-			// Trim leading and trailing whitespace
-			// Encode characters
-			buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_ID,
-					PDETextHelper.translateWriteText(fFieldId.trim(),
-							DEFAULT_SUBSTITUTE_CHARS)));
-		}
-		// Print kind attribute
-		if ((fFieldKind != null) && (fFieldKind.length() > 0)) {
-			// No trim required
-			// No encode required
-			buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_KIND,
-					fFieldKind));
-		}
-		// Print name attribute
-		if ((fFieldName != null) && (fFieldName.length() > 0)) {
-			// Trim leading and trailing whitespace
-			// Encode characters
-			buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_NAME,
-					PDETextHelper.translateWriteText(fFieldName.trim(),
-							DEFAULT_SUBSTITUTE_CHARS)));
-		}
-		// Print skip attribute
-		buffer.append(XMLPrintHandler.wrapAttribute(ATTRIBUTE_SKIP,
-				new Boolean(fFieldSkip).toString()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#parseElement
-	 * (org.w3c.dom.Element)
-	 */
-	protected void parseElement(Element element) {
-		String name = element.getNodeName();
-		ICompCSModelFactory factory = getModel().getFactory();
-
-		if (name.equals(ELEMENT_INTRO)) {
-			// Process intro element
-			fFieldIntro = factory.createCompCSIntro(this);
-			fFieldIntro.parse(element);
-		} else if (name.equals(ELEMENT_ONCOMPLETION)) {
-			// Process onCompletion element
-			fFieldOnCompletion = factory.createCompCSOnCompletion(this);
-			fFieldOnCompletion.parse(element);
-		} else if (name.equals(ELEMENT_DEPENDENCY)) {
-			// Process dependency element
-			ICompCSDependency dependency = factory.createCompCSDependency(this);
-			fFieldDependencies.add(dependency);
-			dependency.parse(element);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#writeElements
-	 * (java.lang.String, java.io.PrintWriter)
-	 */
-	protected void writeElements(String indent, PrintWriter writer) {
-		String newIndent = indent + XMLPrintHandler.XML_INDENT;
-		// Print intro element
-		if (fFieldIntro != null) {
-			fFieldIntro.write(newIndent, writer);
-		}
-		// Print onCompletion element
-		if (fFieldOnCompletion != null) {
-			fFieldOnCompletion.write(newIndent, writer);
-		}
-		// Print dependency elements
-		Iterator iterator = fFieldDependencies.iterator();
-		while (iterator.hasNext()) {
-			ICompCSDependency dependency = (ICompCSDependency) iterator.next();
-			dependency.write(newIndent, writer);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSObject#getElement()
-	 */
-	public abstract String getElement();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java
deleted file mode 100644
index 85e939b..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/comp/CompCSWorkspaceModel.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.comp;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-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.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.IWorkspaceModel;
-import org.eclipse.pde.internal.core.PDECore;
-
-public class CompCSWorkspaceModel extends CompCSModel implements
-		IWorkspaceModel {
-
-	private IFile fFile;
-
-	private boolean fDirty;
-
-	private boolean fEditable;
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 
-	 */
-	public CompCSWorkspaceModel(IFile file, boolean editable) {
-		fFile = file;
-		fEditable = editable;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IEditableModel#save()
-	 */
-	public void save() {
-		try {
-			String contents = getContents();
-			ByteArrayInputStream stream = new ByteArrayInputStream(contents
-					.getBytes("UTF8")); //$NON-NLS-1$
-			if (fFile.exists()) {
-				fFile.setContents(stream, false, false, null);
-			} else {
-				fFile.create(stream, false, null);
-			}
-			stream.close();
-		} catch (CoreException e) {
-			PDECore.logException(e);
-		} catch (IOException e) {
-			// Ignore
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private String getContents() {
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
-		setLoaded(true);
-		save(writer);
-		writer.flush();
-		try {
-			swriter.close();
-		} catch (IOException e) {
-			// Ignore
-		}
-		return swriter.toString();
-	}
-
-	/*
-	 * (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) {
-		if (isLoaded()) {
-			getCompCS().write("", writer); //$NON-NLS-1$
-		}
-		setDirty(false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IEditable#setDirty(boolean)
-	 */
-	public void setDirty(boolean dirty) {
-		fDirty = dirty;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.AbstractModel#fireModelChanged(org.eclipse
-	 * .pde.core.IModelChangedEvent)
-	 */
-	public void fireModelChanged(IModelChangedEvent event) {
-		setDirty(true);
-		super.fireModelChanged(event);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSModel#isEditable()
-	 */
-	public boolean isEditable() {
-		return fEditable;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getInstallLocation() {
-		return fFile.getLocation().toOSString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.AbstractModel#getUnderlyingResource()
-	 */
-	public IResource getUnderlyingResource() {
-		return fFile;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSModel#isInSync()
-	 */
-	public boolean isInSync() {
-		IPath path = fFile.getLocation();
-		if (path == null) {
-			return false;
-		}
-		return isInSync(path.toFile());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSModel#load()
-	 */
-	public void load() throws CoreException {
-		if (fFile.exists()) {
-			InputStream stream = null;
-			try {
-				stream = new BufferedInputStream(fFile.getContents(true));
-				try {
-					if (stream.available() > 0)
-						load(stream, false);
-					else {
-						// if we have an empty file, then mark as loaded so
-						// users changes will be saved
-						setLoaded(true);
-						stream.close();
-					}
-				} catch (IOException e) {
-				}
-			} catch (CoreException e) {
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.IWorkspaceModel#reload()
-	 */
-	public void reload() {
-		// Underlying file has to exist in order to reload the model
-		if (fFile.exists()) {
-			InputStream stream = null;
-			try {
-				// Get the file contents
-				stream = new BufferedInputStream(fFile.getContents(true));
-				// Load the model using the last saved file contents
-				reload(stream, false);
-				// Remove the dirty (*) indicator from the editor window
-				setDirty(false);
-			} catch (CoreException e) {
-				// Ignore
-			}
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCS.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCS.java
deleted file mode 100644
index 93d858a..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCS.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCS extends ISimpleCSObject {
-
-	/**
-	 * Attribute: title
-	 * 
-	 * @return
-	 */
-	public String getTitle();
-
-	/**
-	 * Attribute: title
-	 * 
-	 * @param title
-	 */
-	public void setTitle(String title);
-
-	/**
-	 * Element: intro
-	 * 
-	 * @return
-	 */
-	public ISimpleCSIntro getIntro();
-
-	/**
-	 * Element: intro
-	 * 
-	 * @param intro
-	 */
-	public void setIntro(ISimpleCSIntro intro);
-
-	/**
-	 * Element: item
-	 * 
-	 * @return
-	 */
-	public ISimpleCSItem[] getItems();
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 */
-	public void addItem(ISimpleCSItem item);
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 * @param index
-	 */
-	public void addItem(int index, ISimpleCSItem item);
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 */
-	public void removeItem(ISimpleCSItem item);
-
-	/**
-	 * Element: item
-	 * 
-	 * @param index
-	 */
-	public void removeItem(int index);
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 * @param newRelativeIndex
-	 */
-	public void moveItem(ISimpleCSItem item, int newRelativeIndex);
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 */
-	public boolean isFirstItem(ISimpleCSItem item);
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 */
-	public boolean isLastItem(ISimpleCSItem item);
-
-	/**
-	 * @param item
-	 * @return
-	 */
-	public int indexOfItem(ISimpleCSItem item);
-
-	/**
-	 * Element: item
-	 * 
-	 * @return
-	 */
-	public int getItemCount();
-
-	/**
-	 * Element: item
-	 * 
-	 * @return
-	 */
-	public boolean hasItems();
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 * @return
-	 */
-	public ISimpleCSItem getNextSibling(ISimpleCSItem item);
-
-	/**
-	 * Element: item
-	 * 
-	 * @param item
-	 * @return
-	 */
-	public ISimpleCSItem getPreviousSibling(ISimpleCSItem item);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSAction.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSAction.java
deleted file mode 100644
index ac4d383..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSAction.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSAction extends ISimpleCSRunObject {
-
-	/**
-	 * Attribute: class
-	 * 
-	 * @return
-	 */
-	public String getClazz();
-
-	/**
-	 * Attribute: class
-	 * 
-	 * @param clazz
-	 */
-	public void setClazz(String clazz);
-
-	/**
-	 * Attribute: pluginId
-	 * 
-	 * @return
-	 */
-	public String getPluginId();
-
-	/**
-	 * Attribute: pluginId
-	 * 
-	 * @param pluginId
-	 */
-	public void setPluginId(String pluginId);
-
-	/**
-	 * Attributes: param1, param2, ..., param9
-	 * 
-	 * @return
-	 */
-	public String[] getParams();
-
-	/**
-	 * Attributes: param1, param2, ..., param9
-	 * 
-	 * @return
-	 */
-	public String getParam(int index);
-
-	/**
-	 * Attributes: param1, param2, ..., param9
-	 * 
-	 * @param param
-	 * @param index
-	 */
-	public void setParam(String param, int index);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSCommand.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSCommand.java
deleted file mode 100644
index 9eabdeb..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSCommand.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSCommand extends ISimpleCSRunObject {
-
-	public String getSerialization();
-
-	public void setSerialization(String serialization);
-
-	public String getReturns();
-
-	public void setReturns(String returns);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConditionalSubItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConditionalSubItem.java
deleted file mode 100644
index 2e831e8..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConditionalSubItem.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSConditionalSubItem extends ISimpleCSSubItemObject {
-
-	/**
-	 * Attribute: condition
-	 * 
-	 * @return
-	 */
-	public String getCondition();
-
-	/**
-	 * Attribute: condition
-	 * 
-	 * @param condition
-	 */
-	public void setCondition(String condition);
-
-	/**
-	 * Element: subitem
-	 * 
-	 * @return
-	 */
-	public ISimpleCSSubItem[] getSubItems();
-
-	/**
-	 * Elements: subitem
-	 * 
-	 * @param subitems
-	 */
-	public void addSubItem(ISimpleCSSubItem subitem);
-
-	/**
-	 * Elements: subitem
-	 * 
-	 * @param subitems
-	 */
-	public void removeSubItem(ISimpleCSSubItem subitem);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConstants.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConstants.java
deleted file mode 100644
index f7a2a16..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSConstants.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.ICSConstants;
-
-/**
- * ISimpleCSConstants
- * 
- */
-public interface ISimpleCSConstants extends ICSConstants {
-
-	// Elements
-
-	public static final String ELEMENT_CHEATSHEET = "cheatsheet"; //$NON-NLS-1$
-
-	public static final String ELEMENT_INTRO = "intro"; //$NON-NLS-1$
-
-	public static final String ELEMENT_ITEM = "item"; //$NON-NLS-1$
-
-	public static final String ELEMENT_DESCRIPTION = "description"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_ACTION = "action"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_COMMAND = "command"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_PERFORM_WHEN = "perform-when"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_SUBITEM = "subitem"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_REPEATED_SUBITEM = "repeated-subitem"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_CONDITIONAL_SUBITEM = "conditional-subitem"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_ONCOMPLETION = "onCompletion"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_BR = "br"; //$NON-NLS-1$		
-
-	// Attributes
-
-	public static final String ATTRIBUTE_TITLE = "title"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_CONTEXTID = "contextId"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_HREF = "href"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_DIALOG = "dialog"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_SKIP = "skip"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_LABEL = "label"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_WHEN = "when"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_TRANSLATE = "translate"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_CONDITION = "condition"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_VALUES = "values"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_PLUGINID = "pluginId"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_PARAM = "param"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_CONFIRM = "confirm"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_REQUIRED = "required"; //$NON-NLS-1$		
-
-	public static final String ATTRIBUTE_SERIALIZATION = "serialization"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_RETURNS = "returns"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_ONCOMPLETION = "onCompletion"; //$NON-NLS-1$	
-
-	// Attribute Values
-
-	// Types
-
-	public static final int TYPE_CHEAT_SHEET = 0;
-
-	public static final int TYPE_ACTION = 1;
-
-	public static final int TYPE_COMMAND = 2;
-
-	public static final int TYPE_CONDITIONAL_SUBITEM = 3;
-
-	public static final int TYPE_DESCRIPTION = 4;
-
-	public static final int TYPE_INTRO = 5;
-
-	public static final int TYPE_ITEM = 6;
-
-	public static final int TYPE_ON_COMPLETION = 7;
-
-	public static final int TYPE_PERFORM_WHEN = 8;
-
-	public static final int TYPE_REPEATED_SUBITEM = 9;
-
-	public static final int TYPE_SUBITEM = 10;
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSDescription.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSDescription.java
deleted file mode 100644
index 662109a..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSDescription.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSDescription extends ISimpleCSObject {
-
-	/**
-	 * Content (element)
-	 * 
-	 * @return
-	 */
-	public String getContent();
-
-	/**
-	 * Content (element)
-	 * 
-	 * @param content
-	 */
-	public void setContent(String content);
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSHelpObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSHelpObject.java
deleted file mode 100644
index bad8e6f..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSHelpObject.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSHelpObject extends ISimpleCSObject {
-
-	/**
-	 * Attribute: contextId
-	 * 
-	 * @return
-	 */
-	public String getContextId();
-
-	/**
-	 * Attribute: contextId
-	 * 
-	 * @param contextId
-	 */
-	public void setContextId(String contextId);
-
-	/**
-	 * Attribute: href
-	 * 
-	 * @return
-	 */
-	public String getHref();
-
-	/**
-	 * Attribute: href
-	 * 
-	 * @param href
-	 */
-	public void setHref(String href);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSIntro.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSIntro.java
deleted file mode 100644
index cdadbcc..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSIntro.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSIntro extends ISimpleCSObject, ISimpleCSHelpObject {
-
-	/**
-	 * Element: description
-	 * 
-	 * @return
-	 */
-	public ISimpleCSDescription getDescription();
-
-	/**
-	 * Element: description
-	 * 
-	 * @param description
-	 */
-	public void setDescription(ISimpleCSDescription description);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSItem.java
deleted file mode 100644
index cb7f545..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSItem.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSItem extends ISimpleCSObject, ISimpleCSHelpObject,
-		ISimpleCSRun {
-
-	/**
-	 * Element: description
-	 * 
-	 * @return
-	 */
-	public ISimpleCSDescription getDescription();
-
-	/**
-	 * Element: description
-	 * 
-	 * @param description
-	 */
-	public void setDescription(ISimpleCSDescription description);
-
-	/**
-	 * Attribute: title
-	 * 
-	 * @return
-	 */
-	public String getTitle();
-
-	/**
-	 * Attribute: title
-	 * 
-	 * @param title
-	 */
-	public void setTitle(String title);
-
-	/**
-	 * Attribute: dialog
-	 * 
-	 * @return
-	 */
-	public boolean getDialog();
-
-	/**
-	 * Attribute: dialog
-	 * 
-	 * @param dialog
-	 */
-	public void setDialog(boolean dialog);
-
-	/**
-	 * Attribute: skip
-	 * 
-	 * @return
-	 */
-	public boolean getSkip();
-
-	/**
-	 * Attribute: skip
-	 * 
-	 * @param skip
-	 */
-	public void setSkip(boolean skip);
-
-	/**
-	 * Elements: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @return
-	 */
-	public ISimpleCSSubItemObject[] getSubItems();
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 */
-	public void addSubItem(ISimpleCSSubItemObject subitem);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param index
-	 * @param subitem
-	 */
-	public void addSubItem(int index, ISimpleCSSubItemObject subitem);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 */
-	public void removeSubItem(ISimpleCSSubItemObject subitem);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param index
-	 */
-	public void removeSubItem(int index);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 * @param newRelativeIndex
-	 */
-	public void moveSubItem(ISimpleCSSubItemObject subitem, int newRelativeIndex);
-
-	/**
-	 * Element: onCompletion
-	 * 
-	 * @return
-	 */
-	public ISimpleCSOnCompletion getOnCompletion();
-
-	/**
-	 * Element: onCompletion
-	 * 
-	 * @param onCompletion
-	 */
-	public void setOnCompletion(ISimpleCSOnCompletion onCompletion);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 * @return
-	 */
-	public boolean isFirstSubItem(ISimpleCSSubItemObject subitem);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 * @return
-	 */
-	public boolean isLastSubItem(ISimpleCSSubItemObject subitem);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 * @return
-	 */
-	public int indexOfSubItem(ISimpleCSSubItemObject subitem);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @return
-	 */
-	public int getSubItemCount();
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @return
-	 */
-	public boolean hasSubItems();
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 * @return
-	 */
-	public ISimpleCSSubItemObject getNextSibling(ISimpleCSSubItemObject subitem);
-
-	/**
-	 * Element: subitem, repeated-subitem, conditional-subitem
-	 * 
-	 * @param subitem
-	 * @return
-	 */
-	public ISimpleCSSubItemObject getPreviousSibling(
-			ISimpleCSSubItemObject subitem);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModel.java
deleted file mode 100644
index 7a02e5e..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModel.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangeProvider;
-
-public interface ISimpleCSModel extends IModelChangeProvider, IModel {
-
-	/**
-	 * @return
-	 */
-	ISimpleCS getSimpleCS();
-
-	/**
-	 * @return
-	 */
-	ISimpleCSModelFactory getFactory();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModelFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModelFactory.java
deleted file mode 100644
index c471a5d..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSModelFactory.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-import org.eclipse.pde.internal.core.text.IDocumentNodeFactory;
-
-public interface ISimpleCSModelFactory extends IDocumentNodeFactory {
-
-	/**
-	 * @return
-	 */
-	public ISimpleCS createSimpleCS();
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSAction createSimpleCSAction(ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSCommand createSimpleCSCommand(ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSConditionalSubItem createSimpleCSConditionalSubItem(
-			ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSIntro createSimpleCSIntro(ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSItem createSimpleCSItem(ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSOnCompletion createSimpleCSOnCompletion(
-			ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSPerformWhen createSimpleCSPerformWhen(ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSRepeatedSubItem createSimpleCSRepeatedSubItem(
-			ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSSubItem createSimpleCSSubItem(ISimpleCSObject parent);
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSDescription createSimpleCSDescription(ISimpleCSObject parent);
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSObject.java
deleted file mode 100644
index 7b5b343..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSObject.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-import java.util.List;
-
-import org.eclipse.pde.internal.core.text.IDocumentObject;
-import org.w3c.dom.Element;
-
-public interface ISimpleCSObject extends IDocumentObject, ISimpleCSConstants {
-
-	/**
-	 * @return
-	 */
-	ISimpleCSModel getModel();
-
-	/**
-	 * @param model
-	 */
-	void setModel(ISimpleCSModel model);
-
-	/**
-	 * @return
-	 */
-	ISimpleCS getSimpleCS();
-
-	/**
-	 * @param node
-	 */
-	void parse(Element element);
-
-	/**
-	 * 
-	 */
-	public void reset();
-
-	/**
-	 * To avoid using instanceof all over the place
-	 * 
-	 * @return
-	 */
-	public int getType();
-
-	/**
-	 * For the label provider
-	 * 
-	 * @return
-	 */
-	public String getName();
-
-	/**
-	 * For the content provider
-	 * 
-	 * @return A empty / non-empty list - never null
-	 */
-	public List getChildren();
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSObject getParent();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSOnCompletion.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSOnCompletion.java
deleted file mode 100644
index a2c7898..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSOnCompletion.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSOnCompletion extends ISimpleCSObject {
-
-	/**
-	 * Content (element)
-	 * 
-	 * @return
-	 */
-	public String getContent();
-
-	/**
-	 * Content (element)
-	 * 
-	 * @param content
-	 */
-	public void setContent(String content);
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSPerformWhen.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSPerformWhen.java
deleted file mode 100644
index 240e55b..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSPerformWhen.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSPerformWhen extends ISimpleCSRunContainerObject {
-
-	/**
-	 * Attribute: condition
-	 * 
-	 * @return
-	 */
-	public String getCondition();
-
-	/**
-	 * Attribute: condition
-	 * 
-	 * @param condition
-	 */
-	public void setCondition(String condition);
-
-	/**
-	 * Elements: command, action
-	 * 
-	 * @return
-	 */
-	public ISimpleCSRunObject[] getExecutables();
-
-	/**
-	 * Elements: command, action
-	 * 
-	 * @param executables
-	 */
-	public void addExecutable(ISimpleCSRunObject executable);
-
-	/**
-	 * Elements: command, action
-	 * 
-	 * @param executables
-	 */
-	public void removeExecutable(ISimpleCSRunObject executable);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRepeatedSubItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRepeatedSubItem.java
deleted file mode 100644
index 0006f37..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRepeatedSubItem.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSRepeatedSubItem extends ISimpleCSSubItemObject {
-
-	/**
-	 * Attribute: values
-	 * 
-	 * @return
-	 */
-	public String getValues();
-
-	/**
-	 * Attribute: values
-	 * 
-	 * @param values
-	 */
-	public void setValues(String values);
-
-	/**
-	 * Element: subitem
-	 * 
-	 * @return
-	 */
-	public ISimpleCSSubItem getSubItem();
-
-	/**
-	 * Element: subitem
-	 * 
-	 * @param subitem
-	 */
-	public void setSubItem(ISimpleCSSubItem subitem);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRun.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRun.java
deleted file mode 100644
index 19b2cc4..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRun.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSRun extends ISimpleCSObject {
-
-	/**
-	 * Elements: action, command, perform-when
-	 * 
-	 * @return
-	 */
-	public ISimpleCSRunContainerObject getExecutable();
-
-	/**
-	 * Elements: action, command, perform-when
-	 * 
-	 * @param executable
-	 */
-	public void setExecutable(ISimpleCSRunContainerObject executable);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunContainerObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunContainerObject.java
deleted file mode 100644
index 02ba53f..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunContainerObject.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSRunContainerObject extends ISimpleCSObject {
-	// Used to store a generic type
-	// See type hierarchy
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunObject.java
deleted file mode 100644
index b563e65..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSRunObject.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSRunObject extends ISimpleCSRunContainerObject {
-
-	/**
-	 * Attribute: confirm
-	 * 
-	 * @return
-	 */
-	public boolean getConfirm();
-
-	/**
-	 * Attribute: confirm
-	 * 
-	 * @param confirm
-	 */
-	public void setConfirm(boolean confirm);
-
-	/**
-	 * Attribute: when
-	 * 
-	 * @return
-	 */
-	public String getWhen();
-
-	/**
-	 * Attribute: when
-	 * 
-	 * @param when
-	 */
-	public void setWhen(String when);
-
-	/**
-	 * Attribute: translate
-	 * 
-	 * @return
-	 */
-	public String getTranslate();
-
-	/**
-	 * Attribute: translate
-	 * 
-	 * @param translate
-	 */
-	public void setTranslate(String translate);
-
-	/**
-	 * Attribute: required
-	 * 
-	 * @return
-	 */
-	public boolean getRequired();
-
-	/**
-	 * Attribute: required
-	 * 
-	 * @param required
-	 */
-	public void setRequired(boolean required);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItem.java
deleted file mode 100644
index b411684..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItem.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSSubItem extends ISimpleCSSubItemObject, ISimpleCSRun {
-
-	/**
-	 * Attribute: label
-	 * 
-	 * @return
-	 */
-	public String getLabel();
-
-	/**
-	 * Attribute: label
-	 * 
-	 * @param label
-	 */
-	public void setLabel(String label);
-
-	/**
-	 * Attribute: skip
-	 * 
-	 * @return
-	 */
-	public boolean getSkip();
-
-	/**
-	 * Attribute: skip
-	 * 
-	 * @param skip
-	 */
-	public void setSkip(boolean skip);
-
-	/**
-	 * Attribute: when
-	 * 
-	 * @return
-	 */
-	public String getWhen();
-
-	/**
-	 * Attribute: when
-	 * 
-	 * @param when
-	 */
-	public void setWhen(String when);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItemObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItemObject.java
deleted file mode 100644
index 9ce4812..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/ISimpleCSSubItemObject.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple;
-
-public interface ISimpleCSSubItemObject extends ISimpleCSObject {
-	// Used to store a generic type
-	// See type hierarchy
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCS.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCS.java
deleted file mode 100644
index 44a9eb3..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCS.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSIntro;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-
-public class SimpleCS extends SimpleCSObject implements ISimpleCS {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCS(ISimpleCSModel model) {
-		super(model, ELEMENT_CHEATSHEET);
-		// Root node
-		setInTheModel(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#addItem(org
-	 * .eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public void addItem(ISimpleCSItem item) {
-		addChildNode((IDocumentElementNode) item, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#addItem(int,
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public void addItem(int index, ISimpleCSItem item) {
-		addChildNode((IDocumentElementNode) item, index, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#getIntro()
-	 */
-	public ISimpleCSIntro getIntro() {
-		return (ISimpleCSIntro) getChildNode(ISimpleCSIntro.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#getItemCount()
-	 */
-	public int getItemCount() {
-		return getChildNodeCount(ISimpleCSItem.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#getItems()
-	 */
-	public ISimpleCSItem[] getItems() {
-		ArrayList filteredChildren = getChildNodesList(ISimpleCSItem.class,
-				true);
-		return (ISimpleCSItem[]) filteredChildren
-				.toArray(new ISimpleCSItem[filteredChildren.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#getNextSibling
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public ISimpleCSItem getNextSibling(ISimpleCSItem item) {
-		return (ISimpleCSItem) getNextSibling((IDocumentElementNode) item,
-				ISimpleCSItem.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#getPreviousSibling
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public ISimpleCSItem getPreviousSibling(ISimpleCSItem item) {
-		return (ISimpleCSItem) getPreviousSibling((IDocumentElementNode) item,
-				ISimpleCSItem.class);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#getTitle()
-	 */
-	public String getTitle() {
-		return getXMLAttributeValue(ATTRIBUTE_TITLE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#hasItems()
-	 */
-	public boolean hasItems() {
-		return hasChildNodes(ISimpleCSItem.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#indexOfItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public int indexOfItem(ISimpleCSItem item) {
-		return indexOf((IDocumentElementNode) item);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#isFirstItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public boolean isFirstItem(ISimpleCSItem item) {
-		return isFirstChildNode((IDocumentElementNode) item,
-				ISimpleCSItem.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#isLastItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public boolean isLastItem(ISimpleCSItem item) {
-		return isLastChildNode((IDocumentElementNode) item, ISimpleCSItem.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#moveItem(org
-	 * .eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem, int)
-	 */
-	public void moveItem(ISimpleCSItem item, int newRelativeIndex) {
-		moveChildNode((IDocumentElementNode) item, newRelativeIndex, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#removeItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem)
-	 */
-	public void removeItem(ISimpleCSItem item) {
-		removeChildNode((IDocumentElementNode) item, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#removeItem
-	 * (int)
-	 */
-	public void removeItem(int index) {
-		removeChildNode(index, ISimpleCSItem.class, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#setIntro(org
-	 * .eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSIntro)
-	 */
-	public void setIntro(ISimpleCSIntro intro) {
-		setChildNode((IDocumentElementNode) intro, ISimpleCSIntro.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCS#setTitle(java
-	 * .lang.String)
-	 */
-	public void setTitle(String title) {
-		setXMLAttribute(ATTRIBUTE_TITLE, title);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		return getTitle();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_CHEAT_SHEET;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#isRoot()
-	 */
-	public boolean isRoot() {
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSAction.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSAction.java
deleted file mode 100644
index 13cdfa5..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSAction.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSAction;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-
-public class SimpleCSAction extends SimpleCSRunObject implements
-		ISimpleCSAction {
-
-	private static final long serialVersionUID = 1L;
-
-	private static final int F_MAX_PARAMS = 9;
-
-	// TODO: MP: TEO: MED: Verify translate of paramaters on write is okay - no
-	// translate before
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSAction(ISimpleCSModel model) {
-		super(model, ELEMENT_ACTION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSAction#getClazz
-	 * ()
-	 */
-	public String getClazz() {
-		return getXMLAttributeValue(ATTRIBUTE_CLASS);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSAction#getParam
-	 * (int)
-	 */
-	public String getParam(int index) {
-		// Ensure in valid range
-		if ((index < 1) || (index > F_MAX_PARAMS)) {
-			return null;
-		}
-		StringBuffer buffer = new StringBuffer(ATTRIBUTE_PARAM);
-		buffer.append(index);
-		// Get paramN
-		return getXMLAttributeValue(buffer.toString());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSAction#getParams
-	 * ()
-	 */
-	public String[] getParams() {
-		ArrayList list = new ArrayList();
-		// Get all set parameters
-		for (int i = 1; i <= F_MAX_PARAMS; i++) {
-			String parameter = getParam(i);
-			if (parameter == null) {
-				break;
-			}
-			list.add(parameter);
-		}
-		return (String[]) list.toArray(new String[list.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSAction#getPluginId
-	 * ()
-	 */
-	public String getPluginId() {
-		return getXMLAttributeValue(ATTRIBUTE_PLUGINID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSAction#setClazz
-	 * (java.lang.String)
-	 */
-	public void setClazz(String clazz) {
-		setXMLAttribute(ATTRIBUTE_CLASS, clazz);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSAction#setParam
-	 * (java.lang.String, int)
-	 */
-	public void setParam(String param, int index) {
-		// Ensure proper index
-		if ((index < 1) || (index > F_MAX_PARAMS)) {
-			return;
-		}
-		StringBuffer buffer = new StringBuffer(ATTRIBUTE_PARAM);
-		buffer.append(index);
-		setXMLAttribute(buffer.toString(), param);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSAction#setPluginId
-	 * (java.lang.String)
-	 */
-	public void setPluginId(String pluginId) {
-		setXMLAttribute(ATTRIBUTE_PLUGINID, pluginId);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		// Leave as is. Not a separate node in tree view
-		return ELEMENT_ACTION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_ACTION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#isLeafNode()
-	 */
-	public boolean isLeafNode() {
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSCommand.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSCommand.java
deleted file mode 100644
index 5d65cf6..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSCommand.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSCommand;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-
-public class SimpleCSCommand extends SimpleCSRunObject implements
-		ISimpleCSCommand {
-
-	private static final long serialVersionUID = 1L;
-
-	// TODO: MP: TEO: HIGH: Verify translate attribute values okay - no
-	// translate before
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSCommand(ISimpleCSModel model) {
-		super(model, ELEMENT_COMMAND);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSCommand#getReturns
-	 * ()
-	 */
-	public String getReturns() {
-		return getXMLAttributeValue(ATTRIBUTE_RETURNS);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSCommand#
-	 * getSerialization()
-	 */
-	public String getSerialization() {
-		return getXMLAttributeValue(ATTRIBUTE_SERIALIZATION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSCommand#setReturns
-	 * (java.lang.String)
-	 */
-	public void setReturns(String returns) {
-		setXMLAttribute(ATTRIBUTE_RETURNS, returns);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSCommand#
-	 * setSerialization(java.lang.String)
-	 */
-	public void setSerialization(String serialization) {
-		setXMLAttribute(ATTRIBUTE_SERIALIZATION, serialization);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		// Leave as is. Not a separate node in tree view
-		return ELEMENT_COMMAND;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_COMMAND;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#isLeafNode()
-	 */
-	public boolean isLeafNode() {
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSConditionalSubItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSConditionalSubItem.java
deleted file mode 100644
index f08d412..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSConditionalSubItem.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConditionalSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-
-public class SimpleCSConditionalSubItem extends SimpleCSObject implements
-		ISimpleCSConditionalSubItem {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSConditionalSubItem(ISimpleCSModel model) {
-		super(model, ELEMENT_CONDITIONAL_SUBITEM);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSConditionalSubItem
-	 * #
-	 * addSubItem(org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem
-	 * )
-	 */
-	public void addSubItem(ISimpleCSSubItem subitem) {
-		addChildNode((IDocumentElementNode) subitem, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSConditionalSubItem
-	 * #getCondition()
-	 */
-	public String getCondition() {
-		return getXMLAttributeValue(ATTRIBUTE_CONDITION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSConditionalSubItem
-	 * #getSubItems()
-	 */
-	public ISimpleCSSubItem[] getSubItems() {
-		ArrayList filteredChildren = getChildNodesList(ISimpleCSSubItem.class,
-				true);
-		return (ISimpleCSSubItem[]) filteredChildren
-				.toArray(new ISimpleCSSubItem[filteredChildren.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSConditionalSubItem
-	 * #removeSubItem(org.eclipse.pde.internal.ua.core.icheatsheet.simple.
-	 * ISimpleCSSubItem)
-	 */
-	public void removeSubItem(ISimpleCSSubItem subitem) {
-		removeChildNode((IDocumentElementNode) subitem, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSConditionalSubItem
-	 * #setCondition(java.lang.String)
-	 */
-	public void setCondition(String condition) {
-		setXMLAttribute(ATTRIBUTE_CONDITION, condition);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getChildren
-	 * ()
-	 */
-	public List getChildren() {
-		// Add subitems
-		return getChildNodesList(ISimpleCSSubItem.class, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		// Leave as is. Not supported in editor UI
-		return ELEMENT_CONDITIONAL_SUBITEM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_CONDITIONAL_SUBITEM;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDescription.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDescription.java
deleted file mode 100644
index 5764f20..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDescription.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSDescription;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-
-public class SimpleCSDescription extends SimpleCSObject implements
-		ISimpleCSDescription {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSDescription(ISimpleCSModel model) {
-		super(model, ELEMENT_DESCRIPTION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSDescription
-	 * #getContent()
-	 */
-	public String getContent() {
-		return getXMLContent();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSDescription
-	 * #setContent(java.lang.String)
-	 */
-	public void setContent(String content) {
-		setXMLContent(content);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		return getContent();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_DESCRIPTION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#
-	 * isContentCollapsed()
-	 */
-	public boolean isContentCollapsed() {
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java
deleted file mode 100644
index 2c81034..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentFactory.java
+++ /dev/null

@@ -1,429 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import org.eclipse.pde.internal.core.text.DocumentNodeFactory;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.core.text.plugin.DocumentGenericNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSAction;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSCommand;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConditionalSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSDescription;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSIntro;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModelFactory;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSOnCompletion;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSPerformWhen;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRepeatedSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-
-public class SimpleCSDocumentFactory extends DocumentNodeFactory implements
-		ISimpleCSModelFactory {
-
-	private SimpleCSModel fModel;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSDocumentFactory(SimpleCSModel model) {
-		super();
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.DocumentNodeFactory#createDocumentTextNode
-	 * (java.lang.String,
-	 * org.eclipse.pde.internal.core.text.IDocumentElementNode)
-	 */
-	public IDocumentTextNode createDocumentTextNode(String content,
-			IDocumentElementNode parent) {
-		IDocumentTextNode textNode = new SimpleCSDocumentTextNode();
-		textNode.setEnclosingElement(parent);
-		parent.addTextNode(textNode);
-		textNode.setText(content);
-		return textNode;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.IDocumentNodeFactory#createDocumentNode
-	 * (java.lang.String,
-	 * org.eclipse.pde.internal.core.text.IDocumentElementNode)
-	 */
-	public IDocumentElementNode createDocumentNode(String name,
-			IDocumentElementNode parent) {
-
-		// Semantics:
-		// org.eclipse.platform.doc.isv/reference/extension-points/cheatSheetContentFileSpec.html
-
-		// TODO: MP: TEO: MED: Change factory interface - Parent is not needed
-		// as it is set in the DocumentHandler
-		// TODO: MP: TEO: MED: Change to interfaces for checking instance of and
-		// cast
-		// TODO: MP: TEO: LOW: Prioritize "if" order
-
-		if (parent == null) {
-			if (isSimpleCS(name)) {
-				// Root
-				return (IDocumentElementNode) createSimpleCS();
-			}
-		} else if (parent instanceof SimpleCS) {
-			if (isIntro(name)) {
-				// Intro
-				return (IDocumentElementNode) createSimpleCSIntro((SimpleCS) parent);
-			} else if (isItem(name)) {
-				// Item
-				return (IDocumentElementNode) createSimpleCSItem((SimpleCS) parent);
-			}
-		} else if (parent instanceof SimpleCSIntro) {
-			if (isDescription(name)) {
-				// Description
-				return (IDocumentElementNode) createSimpleCSDescription((SimpleCSIntro) parent);
-			}
-		} else if (parent instanceof SimpleCSItem) {
-			if (isDescription(name)) {
-				// Description
-				return (IDocumentElementNode) createSimpleCSDescription((SimpleCSItem) parent);
-			} else if (isAction(name)) {
-				// Action
-				return (IDocumentElementNode) createSimpleCSAction((SimpleCSItem) parent);
-			} else if (isCommand(name)) {
-				// Command
-				return (IDocumentElementNode) createSimpleCSCommand((SimpleCSItem) parent);
-			} else if (isPerformWhen(name)) {
-				// Perform When
-				return (IDocumentElementNode) createSimpleCSPerformWhen((SimpleCSItem) parent);
-			} else if (isSubitem(name)) {
-				// Subitem
-				return (IDocumentElementNode) createSimpleCSSubItem((SimpleCSItem) parent);
-			} else if (isConditionalSubitem(name)) {
-				// Conditional Subitem
-				return (IDocumentElementNode) createSimpleCSConditionalSubItem((SimpleCSItem) parent);
-			} else if (isRepeatedSubitem(name)) {
-				// Repeated Subitem
-				return (IDocumentElementNode) createSimpleCSRepeatedSubItem((SimpleCSItem) parent);
-			} else if (isOnCompletion(name)) {
-				// On Completion
-				return (IDocumentElementNode) createSimpleCSOnCompletion((SimpleCSItem) parent);
-			}
-		} else if (parent instanceof SimpleCSSubItem) {
-			if (isPerformWhen(name)) {
-				// Perform When
-				return (IDocumentElementNode) createSimpleCSPerformWhen((SimpleCSSubItem) parent);
-			} else if (isAction(name)) {
-				// Action
-				return (IDocumentElementNode) createSimpleCSAction((SimpleCSSubItem) parent);
-			} else if (isCommand(name)) {
-				// Command
-				return (IDocumentElementNode) createSimpleCSCommand((SimpleCSSubItem) parent);
-			}
-		} else if (parent instanceof SimpleCSConditionalSubItem) {
-			if (isSubitem(name)) {
-				// Subitem
-				return (IDocumentElementNode) createSimpleCSSubItem((SimpleCSConditionalSubItem) parent);
-			}
-		} else if (parent instanceof SimpleCSRepeatedSubItem) {
-			if (isSubitem(name)) {
-				// Subitem
-				return (IDocumentElementNode) createSimpleCSSubItem((SimpleCSRepeatedSubItem) parent);
-			}
-		} else if (parent instanceof SimpleCSPerformWhen) {
-			if (isAction(name)) {
-				// Action
-				return (IDocumentElementNode) createSimpleCSAction((SimpleCSPerformWhen) parent);
-			} else if (isCommand(name)) {
-				// Command
-				return (IDocumentElementNode) createSimpleCSCommand((SimpleCSPerformWhen) parent);
-			}
-		} else if (parent instanceof SimpleCSDescription) {
-			if (isBr(name)) {
-				// Br
-				return createBr();
-			}
-		} else if (parent instanceof SimpleCSOnCompletion) {
-			if (isBr(name)) {
-				// Br
-				return createBr();
-			}
-		}
-		// Description has no children
-		// Action has no children
-		// Command has no children
-		// OnCompletion has no children
-		return super.createDocumentNode(name, parent);
-	}
-
-	/**
-	 * @param name
-	 * @param elementName
-	 * @return
-	 */
-	private boolean isCSElement(String name, String elementName) {
-		if (name.equals(elementName)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isSimpleCS(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_CHEATSHEET);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isIntro(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_INTRO);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isDescription(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_DESCRIPTION);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isItem(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_ITEM);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isAction(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_ACTION);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isCommand(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_COMMAND);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isPerformWhen(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_PERFORM_WHEN);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isSubitem(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_SUBITEM);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isRepeatedSubitem(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_REPEATED_SUBITEM);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isConditionalSubitem(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_CONDITIONAL_SUBITEM);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isOnCompletion(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_ONCOMPLETION);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isBr(String name) {
-		return isCSElement(name, ISimpleCSConstants.ELEMENT_BR);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCS()
-	 */
-	public ISimpleCS createSimpleCS() {
-		return new SimpleCS(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSAction
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSAction createSimpleCSAction(ISimpleCSObject parent) {
-		return new SimpleCSAction(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSCommand
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSCommand createSimpleCSCommand(ISimpleCSObject parent) {
-		return new SimpleCSCommand(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSConditionalSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSConditionalSubItem createSimpleCSConditionalSubItem(
-			ISimpleCSObject parent) {
-		return new SimpleCSConditionalSubItem(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSDescription
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSDescription createSimpleCSDescription(ISimpleCSObject parent) {
-		return new SimpleCSDescription(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSIntro
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSIntro createSimpleCSIntro(ISimpleCSObject parent) {
-		return new SimpleCSIntro(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSItem createSimpleCSItem(ISimpleCSObject parent) {
-		return new SimpleCSItem(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSOnCompletion
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSOnCompletion createSimpleCSOnCompletion(
-			ISimpleCSObject parent) {
-		return new SimpleCSOnCompletion(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSPerformWhen
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSPerformWhen createSimpleCSPerformWhen(ISimpleCSObject parent) {
-		return new SimpleCSPerformWhen(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSRepeatedSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSRepeatedSubItem createSimpleCSRepeatedSubItem(
-			ISimpleCSObject parent) {
-		return new SimpleCSRepeatedSubItem(fModel);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModelFactory
-	 * #createSimpleCSSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject)
-	 */
-	public ISimpleCSSubItem createSimpleCSSubItem(ISimpleCSObject parent) {
-		return new SimpleCSSubItem(fModel);
-	}
-
-	/**
-	 * @return
-	 */
-	protected IDocumentElementNode createBr() {
-		return new DocumentGenericNode(ISimpleCSConstants.ELEMENT_BR) {
-			private static final long serialVersionUID = 1L;
-
-			public boolean isLeafNode() {
-				return true;
-			}
-		};
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java
deleted file mode 100644
index c315e60..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentHandler.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.NodeDocumentHandler;
-
-public class SimpleCSDocumentHandler extends NodeDocumentHandler {
-
-	private SimpleCSModel fModel;
-
-	/**
-	 * @param reconciling
-	 */
-	public SimpleCSDocumentHandler(SimpleCSModel model, boolean reconciling) {
-		super(reconciling, model.getFactory());
-		fModel = model;
-		fCollapsibleParentName = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.DocumentHandler#getDocument()
-	 */
-	protected IDocument getDocument() {
-		return fModel.getDocument();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.NodeDocumentHandler#getRootNode()
-	 */
-	protected IDocumentElementNode getRootNode() {
-		return (IDocumentElementNode) fModel.getSimpleCS();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentTextNode.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentTextNode.java
deleted file mode 100644
index 9462811..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSDocumentTextNode.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.HashSet;
-
-import org.eclipse.pde.internal.core.text.DocumentTextNode;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-
-public class SimpleCSDocumentTextNode extends DocumentTextNode {
-
-	private static final long serialVersionUID = 1L;
-
-	private static final HashSet TAG_EXCEPTIONS = new HashSet(3);
-
-	static {
-		TAG_EXCEPTIONS.add("b"); //$NON-NLS-1$
-		TAG_EXCEPTIONS.add("/b"); //$NON-NLS-1$
-		TAG_EXCEPTIONS.add("br/"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public SimpleCSDocumentTextNode() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.DocumentTextNode#write()
-	 */
-	public String write() {
-		String content = getText().trim();
-		return PDETextHelper.translateWriteText(content, TAG_EXCEPTIONS,
-				SUBSTITUTE_CHARS);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSIntro.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSIntro.java
deleted file mode 100644
index 564977f..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSIntro.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSDescription;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSIntro;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-
-public class SimpleCSIntro extends SimpleCSObject implements ISimpleCSIntro {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSIntro(ISimpleCSModel model) {
-		super(model, ELEMENT_INTRO);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSIntro#
-	 * getDescription()
-	 */
-	public ISimpleCSDescription getDescription() {
-		return (ISimpleCSDescription) getChildNode(ISimpleCSDescription.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSIntro#
-	 * setDescription
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSDescription
-	 * )
-	 */
-	public void setDescription(ISimpleCSDescription description) {
-		setChildNode((IDocumentElementNode) description,
-				ISimpleCSDescription.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * getContextId()
-	 */
-	public String getContextId() {
-		return getXMLAttributeValue(ATTRIBUTE_CONTEXTID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * getHref()
-	 */
-	public String getHref() {
-		return getXMLAttributeValue(ATTRIBUTE_HREF);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * setContextId(java.lang.String)
-	 */
-	public void setContextId(String contextId) {
-		setXMLAttribute(ATTRIBUTE_CONTEXTID, contextId);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * setHref(java.lang.String)
-	 */
-	public void setHref(String href) {
-		setXMLAttribute(ATTRIBUTE_HREF, href);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject
-	 * #getName ()
-	 */
-	public String getName() {
-		return ELEMENT_INTRO;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject
-	 * #getType ()
-	 */
-	public int getType() {
-		return TYPE_INTRO;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSItem.java
deleted file mode 100644
index 9af0f0d..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSItem.java
+++ /dev/null

@@ -1,404 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSDescription;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSOnCompletion;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSPerformWhen;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunContainerObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItemObject;
-
-public class SimpleCSItem extends SimpleCSObject implements ISimpleCSItem {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSItem(ISimpleCSModel model) {
-		super(model, ELEMENT_ITEM);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#addSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public void addSubItem(ISimpleCSSubItemObject subitem) {
-		addChildNode((IDocumentElementNode) subitem, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#addSubItem
-	 * (int,
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public void addSubItem(int index, ISimpleCSSubItemObject subitem) {
-		addChildNode((IDocumentElementNode) subitem, index, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#getDescription
-	 * ()
-	 */
-	public ISimpleCSDescription getDescription() {
-		return (ISimpleCSDescription) getChildNode(ISimpleCSDescription.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#getDialog
-	 * ()
-	 */
-	public boolean getDialog() {
-		return getBooleanAttributeValue(ATTRIBUTE_DIALOG, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#getNextSibling
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public ISimpleCSSubItemObject getNextSibling(ISimpleCSSubItemObject subitem) {
-		return (ISimpleCSSubItemObject) getNextSibling(
-				(IDocumentElementNode) subitem, ISimpleCSSubItemObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#
-	 * getOnCompletion()
-	 */
-	public ISimpleCSOnCompletion getOnCompletion() {
-		return (ISimpleCSOnCompletion) getChildNode(ISimpleCSOnCompletion.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#
-	 * getPreviousSibling
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public ISimpleCSSubItemObject getPreviousSibling(
-			ISimpleCSSubItemObject subitem) {
-		return (ISimpleCSSubItemObject) getPreviousSibling(
-				(IDocumentElementNode) subitem, ISimpleCSSubItemObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#getSkip()
-	 */
-	public boolean getSkip() {
-		return getBooleanAttributeValue(ATTRIBUTE_SKIP, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#
-	 * getSubItemCount()
-	 */
-	public int getSubItemCount() {
-		return getChildNodeCount(ISimpleCSSubItemObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#getSubItems
-	 * ()
-	 */
-	public ISimpleCSSubItemObject[] getSubItems() {
-		ArrayList filteredChildren = getChildNodesList(
-				ISimpleCSSubItemObject.class, true);
-		return (ISimpleCSSubItemObject[]) filteredChildren
-				.toArray(new ISimpleCSSubItemObject[filteredChildren.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#getTitle()
-	 */
-	public String getTitle() {
-		return getXMLAttributeValue(ATTRIBUTE_TITLE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#hasSubItems
-	 * ()
-	 */
-	public boolean hasSubItems() {
-		return hasChildNodes(ISimpleCSSubItemObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#indexOfSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public int indexOfSubItem(ISimpleCSSubItemObject subitem) {
-		return indexOf((IDocumentElementNode) subitem);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#isFirstSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public boolean isFirstSubItem(ISimpleCSSubItemObject subitem) {
-		return isFirstChildNode((IDocumentElementNode) subitem,
-				ISimpleCSSubItemObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#isLastSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public boolean isLastSubItem(ISimpleCSSubItemObject subitem) {
-		return isLastChildNode((IDocumentElementNode) subitem,
-				ISimpleCSSubItemObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#moveSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject,
-	 * int)
-	 */
-	public void moveSubItem(ISimpleCSSubItemObject subitem, int newRelativeIndex) {
-		moveChildNode((IDocumentElementNode) subitem, newRelativeIndex, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#removeSubItem
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItemObject)
-	 */
-	public void removeSubItem(ISimpleCSSubItemObject subitem) {
-		removeChildNode((IDocumentElementNode) subitem, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#removeSubItem
-	 * (int)
-	 */
-	public void removeSubItem(int index) {
-		removeChildNode(index, ISimpleCSSubItemObject.class, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#setDescription
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSDescription)
-	 */
-	public void setDescription(ISimpleCSDescription description) {
-		setChildNode((IDocumentElementNode) description,
-				ISimpleCSDescription.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#setDialog
-	 * (boolean)
-	 */
-	public void setDialog(boolean dialog) {
-		setBooleanAttributeValue(ATTRIBUTE_DIALOG, dialog);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#
-	 * setOnCompletion
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSOnCompletion)
-	 */
-	public void setOnCompletion(ISimpleCSOnCompletion onCompletion) {
-		setChildNode((IDocumentElementNode) onCompletion,
-				ISimpleCSOnCompletion.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#setSkip
-	 * (boolean)
-	 */
-	public void setSkip(boolean skip) {
-		setBooleanAttributeValue(ATTRIBUTE_SKIP, skip);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSItem#setTitle
-	 * (java.lang.String)
-	 */
-	public void setTitle(String title) {
-		setXMLAttribute(ATTRIBUTE_TITLE, title);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * getContextId()
-	 */
-	public String getContextId() {
-		return getXMLAttributeValue(ATTRIBUTE_CONTEXTID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * getHref()
-	 */
-	public String getHref() {
-		return getXMLAttributeValue(ATTRIBUTE_HREF);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * setContextId(java.lang.String)
-	 */
-	public void setContextId(String contextId) {
-		setXMLAttribute(ATTRIBUTE_CONTEXTID, contextId);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSHelpObject#
-	 * setHref(java.lang.String)
-	 */
-	public void setHref(String href) {
-		setXMLAttribute(ATTRIBUTE_HREF, href);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRun#getExecutable
-	 * ()
-	 */
-	public ISimpleCSRunContainerObject getExecutable() {
-		return (ISimpleCSRunContainerObject) getChildNode(ISimpleCSRunContainerObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRun#setExecutable
-	 * (
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunContainerObject
-	 * )
-	 */
-	public void setExecutable(ISimpleCSRunContainerObject executable) {
-		setChildNode((IDocumentElementNode) executable,
-				ISimpleCSRunContainerObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		return getTitle();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_ITEM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.cheatsheet.simple.SimpleCSObject#getChildren
-	 * ()
-	 */
-	public List getChildren() {
-		// Add subitems
-		// Add unsupported perform-when if it is set as the executable
-		Class[] classes = { ISimpleCSSubItemObject.class,
-				ISimpleCSPerformWhen.class };
-		return getChildNodesList(classes, true);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java
deleted file mode 100644
index a788c9b..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSModel.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IWritable;
-import org.eclipse.pde.internal.core.NLResourceHelper;
-import org.eclipse.pde.internal.core.text.XMLEditingModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModelFactory;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class SimpleCSModel extends XMLEditingModel implements ISimpleCSModel {
-
-	private SimpleCSDocumentHandler fHandler;
-
-	private SimpleCSDocumentFactory fFactory;
-
-	private ISimpleCS fSimpleCS;
-
-	/**
-	 * @param document
-	 * @param isReconciling
-	 */
-	public SimpleCSModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-
-		fHandler = null;
-		fFactory = new SimpleCSDocumentFactory(this);
-		fSimpleCS = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.XMLEditingModel#createDocumentHandler
-	 * (org.eclipse.pde.core.IModel, boolean)
-	 */
-	protected DefaultHandler createDocumentHandler(IModel model,
-			boolean reconciling) {
-
-		if (fHandler == null) {
-			fHandler = new SimpleCSDocumentHandler(this, reconciling);
-		}
-		return fHandler;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.AbstractEditingModel#
-	 * createNLResourceHelper()
-	 */
-	protected NLResourceHelper createNLResourceHelper() {
-		// Not needed
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModel#getFactory
-	 * ()
-	 */
-	public ISimpleCSModelFactory getFactory() {
-		return fFactory;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModel#getSimpleCS
-	 * ()
-	 */
-	public ISimpleCS getSimpleCS() {
-		if (fSimpleCS == null) {
-			fSimpleCS = getFactory().createSimpleCS();
-		}
-		// TODO: MP: TEO: LOW: Remove cast once interface method created
-		((SimpleCSObject) fSimpleCS).setInTheModel(true);
-		return fSimpleCS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.XMLEditingModel#getRoot()
-	 */
-	protected IWritable getRoot() {
-		return getSimpleCS();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSObject.java
deleted file mode 100644
index 88d785f..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSObject.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.io.PrintWriter;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.plugin.IWritableDelimiter;
-import org.eclipse.pde.internal.core.text.DocumentObject;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.core.text.plugin.DocumentGenericNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.w3c.dom.Element;
-
-public abstract class SimpleCSObject extends DocumentObject implements
-		ISimpleCSObject, IWritableDelimiter {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param tagName
-	 */
-	public SimpleCSObject(ISimpleCSModel model, String tagName) {
-		super(model, tagName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		return getChildNodesList(DocumentGenericNode.class, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getModel
-	 * ()
-	 */
-	public ISimpleCSModel getModel() {
-		return (ISimpleCSModel) getSharedModel();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getName
-	 * ()
-	 */
-	public abstract String getName();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getParent
-	 * ()
-	 */
-	public ISimpleCSObject getParent() {
-		return (ISimpleCSObject) getParentNode();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getSimpleCS
-	 * ()
-	 */
-	public ISimpleCS getSimpleCS() {
-		return getModel().getSimpleCS();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#getType
-	 * ()
-	 */
-	public abstract int getType();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#parse
-	 * (org.w3c.dom.Element)
-	 */
-	public void parse(Element element) {
-		// TODO: MP: TEO: LOW: Remove parse from interface - once old simpleCS
-		// model is deleted
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSObject#setModel
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSModel)
-	 */
-	public void setModel(ISimpleCSModel model) {
-		setSharedModel(model);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.plugin.IWritableDelimeter#writeDelimeter
-	 * (java.io.PrintWriter)
-	 */
-	public void writeDelimeter(PrintWriter writer) {
-		// TODO: MP: TEO: LOW: Probably \n for all
-		// NO-OP
-		// Child classes to override
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#
-	 * createDocumentTextNode()
-	 */
-	protected IDocumentTextNode createDocumentTextNode() {
-		return new SimpleCSDocumentTextNode();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSOnCompletion.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSOnCompletion.java
deleted file mode 100644
index 4a6cfc1..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSOnCompletion.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSOnCompletion;
-
-public class SimpleCSOnCompletion extends SimpleCSObject implements
-		ISimpleCSOnCompletion {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSOnCompletion(ISimpleCSModel model) {
-		super(model, ELEMENT_ONCOMPLETION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSOnCompletion
-	 * #getContent()
-	 */
-	public String getContent() {
-		return getXMLContent();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSOnCompletion
-	 * #setContent(java.lang.String)
-	 */
-	public void setContent(String content) {
-		setXMLContent(content);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		return ELEMENT_ONCOMPLETION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_ON_COMPLETION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#
-	 * isContentCollapsed()
-	 */
-	public boolean isContentCollapsed() {
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSPerformWhen.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSPerformWhen.java
deleted file mode 100644
index 7349376..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSPerformWhen.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSPerformWhen;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunObject;
-
-public class SimpleCSPerformWhen extends SimpleCSObject implements
-		ISimpleCSPerformWhen {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSPerformWhen(ISimpleCSModel model) {
-		super(model, ELEMENT_PERFORM_WHEN);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSPerformWhen
-	 * #addExecutable
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject)
-	 */
-	public void addExecutable(ISimpleCSRunObject executable) {
-		addChildNode((IDocumentElementNode) executable, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSPerformWhen
-	 * #getCondition()
-	 */
-	public String getCondition() {
-		return getXMLAttributeValue(ATTRIBUTE_CONDITION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSPerformWhen
-	 * #getExecutables()
-	 */
-	public ISimpleCSRunObject[] getExecutables() {
-		ArrayList filteredChildren = getChildNodesList(
-				ISimpleCSRunObject.class, true);
-		return (ISimpleCSRunObject[]) filteredChildren
-				.toArray(new ISimpleCSRunObject[filteredChildren.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSPerformWhen
-	 * #removeExecutable
-	 * (org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject)
-	 */
-	public void removeExecutable(ISimpleCSRunObject executable) {
-		removeChildNode((IDocumentElementNode) executable, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSPerformWhen
-	 * #setCondition(java.lang.String)
-	 */
-	public void setCondition(String condition) {
-		setXMLAttribute(ATTRIBUTE_CONDITION, condition);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		return new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		// Leave as is. Not supported in editor UI
-		return ELEMENT_PERFORM_WHEN;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_PERFORM_WHEN;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRepeatedSubItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRepeatedSubItem.java
deleted file mode 100644
index a835d4c..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRepeatedSubItem.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.List;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRepeatedSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-
-public class SimpleCSRepeatedSubItem extends SimpleCSObject implements
-		ISimpleCSRepeatedSubItem {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSRepeatedSubItem(ISimpleCSModel model) {
-		super(model, ELEMENT_REPEATED_SUBITEM);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRepeatedSubItem
-	 * #getSubItem()
-	 */
-	public ISimpleCSSubItem getSubItem() {
-		return (ISimpleCSSubItem) getChildNode(ISimpleCSSubItem.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRepeatedSubItem
-	 * #getValues()
-	 */
-	public String getValues() {
-		return getXMLAttributeValue(ATTRIBUTE_VALUES);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRepeatedSubItem
-	 * #
-	 * setSubItem(org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem
-	 * )
-	 */
-	public void setSubItem(ISimpleCSSubItem subitem) {
-		setChildNode((IDocumentElementNode) subitem, ISimpleCSSubItem.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRepeatedSubItem
-	 * #setValues(java.lang.String)
-	 */
-	public void setValues(String values) {
-		setXMLAttribute(ATTRIBUTE_VALUES, values);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		// Add subitem
-		// TODO: MP: TEO: LOW: Write general method to return first occurrence
-		// only?
-		return getChildNodesList(ISimpleCSSubItem.class, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		// Leave as is. Not supported in editor UI
-		return ELEMENT_REPEATED_SUBITEM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_REPEATED_SUBITEM;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRunObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRunObject.java
deleted file mode 100644
index fba6f3e..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSRunObject.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunObject;
-
-public abstract class SimpleCSRunObject extends SimpleCSObject implements
-		ISimpleCSRunObject {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 * @param tagName
-	 */
-	public SimpleCSRunObject(ISimpleCSModel model, String tagName) {
-		super(model, tagName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#
-	 * getConfirm()
-	 */
-	public boolean getConfirm() {
-		return getBooleanAttributeValue(ATTRIBUTE_CONFIRM, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#
-	 * getRequired()
-	 */
-	public boolean getRequired() {
-		return getBooleanAttributeValue(ATTRIBUTE_REQUIRED, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#
-	 * getTranslate()
-	 */
-	public String getTranslate() {
-		return getXMLAttributeValue(ATTRIBUTE_TRANSLATE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#getWhen
-	 * ()
-	 */
-	public String getWhen() {
-		return getXMLAttributeValue(ATTRIBUTE_WHEN);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#
-	 * setConfirm(boolean)
-	 */
-	public void setConfirm(boolean confirm) {
-		setBooleanAttributeValue(ATTRIBUTE_CONFIRM, confirm);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#
-	 * setRequired(boolean)
-	 */
-	public void setRequired(boolean required) {
-		setBooleanAttributeValue(ATTRIBUTE_REQUIRED, required);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#
-	 * setTranslate(java.lang.String)
-	 */
-	public void setTranslate(String translate) {
-		setXMLAttribute(ATTRIBUTE_TRANSLATE, translate);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunObject#setWhen
-	 * (java.lang.String)
-	 */
-	public void setWhen(String when) {
-		setXMLAttribute(ATTRIBUTE_WHEN, when);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSSubItem.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSSubItem.java
deleted file mode 100644
index aa2b7b0..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/cheatsheet/simple/text/SimpleCSSubItem.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.cheatsheet.simple.text;
-
-import java.util.List;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSPerformWhen;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunContainerObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-
-public class SimpleCSSubItem extends SimpleCSObject implements ISimpleCSSubItem {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @param model
-	 */
-	public SimpleCSSubItem(ISimpleCSModel model) {
-		super(model, ELEMENT_SUBITEM);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem#getLabel
-	 * ()
-	 */
-	public String getLabel() {
-		return getXMLAttributeValue(ATTRIBUTE_LABEL);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem#getSkip
-	 * ()
-	 */
-	public boolean getSkip() {
-		return getBooleanAttributeValue(ATTRIBUTE_SKIP, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem#getWhen
-	 * ()
-	 */
-	public String getWhen() {
-		return getXMLAttributeValue(ATTRIBUTE_WHEN);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem#setLabel
-	 * (java.lang.String)
-	 */
-	public void setLabel(String label) {
-		setXMLAttribute(ATTRIBUTE_LABEL, label);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem#setSkip
-	 * (boolean)
-	 */
-	public void setSkip(boolean skip) {
-		setBooleanAttributeValue(ATTRIBUTE_SKIP, skip);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSSubItem#setWhen
-	 * (java.lang.String)
-	 */
-	public void setWhen(String when) {
-		setXMLAttribute(ATTRIBUTE_WHEN, when);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRun#getExecutable
-	 * ()
-	 */
-	public ISimpleCSRunContainerObject getExecutable() {
-		return (ISimpleCSRunContainerObject) getChildNode(ISimpleCSRunContainerObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRun#setExecutable
-	 * (
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ISimpleCSRunContainerObject
-	 * )
-	 */
-	public void setExecutable(ISimpleCSRunContainerObject executable) {
-		setChildNode((IDocumentElementNode) executable,
-				ISimpleCSRunContainerObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#
-	 * getChildren()
-	 */
-	public List getChildren() {
-		// TODO: MP: TEO: LOW: Revisit children returned that only can have one
-		// - do not return full list
-		// Add unsupported perform-when if it is set as the executable
-		return getChildNodesList(ISimpleCSPerformWhen.class, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getName
-	 * ()
-	 */
-	public String getName() {
-		return getLabel();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.text.cheatsheet.simple.SimpleCSObject#getType
-	 * ()
-	 */
-	public int getType() {
-		return TYPE_SUBITEM;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/ICtxHelpConstants.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/ICtxHelpConstants.java
deleted file mode 100644
index 23ecf66..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/ICtxHelpConstants.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp;
-
-/**
- * Interface containing constants used for the context help editor.
- * 
- * @since 3.4
- */
-public interface ICtxHelpConstants {
-
-	// Elements
-
-	public static final String ELEMENT_ROOT = "contexts"; //$NON-NLS-1$
-
-	public static final String ELEMENT_CONTEXT = "context"; //$NON-NLS-1$
-
-	public static final String ELEMENT_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	public static final String ELEMENT_TOPIC = "topic"; //$NON-NLS-1$
-
-	public static final String ELEMENT_COMMAND = "command"; //$NON-NLS-1$
-
-	// Attributes
-
-	public static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_TITLE = "title"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_LABEL = "label"; //$NON-NLS-1$		
-
-	public static final String ATTRIBUTE_HREF = "href"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_SERIAL = "serialization"; //$NON-NLS-1$	
-
-	public static final String ATTRIBUTE_FILTER = "filter"; //$NON-NLS-1$	
-
-	// Types
-
-	public static final int TYPE_ROOT = 0;
-
-	public static final int TYPE_CONTEXT = 1;
-
-	public static final int TYPE_DESCRIPTION = 2;
-
-	public static final int TYPE_TOPIC = 3;
-
-	public static final int TYPE_COMMAND = 4;
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpCommand.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpCommand.java
deleted file mode 100644
index aaca23e..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpCommand.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-/**
- * Represents a command entry in context help. Commands are used to launch
- * actions when clicked on by the user. Commands are leaf objects.
- * 
- * @since 3.4
- * @see CtxHelpObject
- * @see CtxHelpModel
- * @see CtxHelpDocumentFactory
- */
-public class CtxHelpCommand extends CtxHelpObject {
-
-	private static final long serialVersionUID = 1L;
-
-	public CtxHelpCommand(CtxHelpModel model) {
-		super(model, ELEMENT_COMMAND);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getType()
-	 */
-	public int getType() {
-		return TYPE_COMMAND;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getName()
-	 */
-	public String getName() {
-		return getLabel();
-	}
-
-	/**
-	 * @return the value of the label attribute or <code>null</code> if the
-	 *         attribute does not exist
-	 */
-	public String getLabel() {
-		return getXMLAttributeValue(ATTRIBUTE_LABEL);
-	}
-
-	/**
-	 * Set the label attribute, passing <code>null</code> will set the attribute
-	 * to be empty.
-	 * 
-	 * @param label
-	 *            new value
-	 */
-	public void setLabel(String label) {
-		setXMLAttribute(ATTRIBUTE_LABEL, label);
-	}
-
-	/**
-	 * @return the value of the serialization attribute or <code>null</code> if
-	 *         the attribute does not exist
-	 */
-	public String getSerialization() {
-		return getXMLAttributeValue(ATTRIBUTE_SERIAL);
-	}
-
-	/**
-	 * Set the serialization attribute, passing <code>null</code> will set the
-	 * attribute to be empty.
-	 * 
-	 * @param serialization
-	 *            new value
-	 */
-	public void setSerialization(String serialization) {
-		setXMLAttribute(ATTRIBUTE_SERIAL, serialization);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddChild(org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddSibling
-	 * (int)
-	 */
-	public boolean canAddSibling(int objectType) {
-		return objectType == TYPE_COMMAND || objectType == TYPE_TOPIC;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpContext.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpContext.java
deleted file mode 100644
index 08d76be..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpContext.java
+++ /dev/null

@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-
-/**
- * Represents a context entry in context help. Contexts have a specific id that
- * allows UI elements to be associated with a list of commands and topics that
- * are stored in the context. Contexts may have one optional description element
- * and as many topic and command elements as needed.
- * 
- * @since 3.4
- * @see CtxHelpObject
- * @see CtxHelpModel
- * @see CtxHelpDocumentFactory
- */
-public class CtxHelpContext extends CtxHelpObject {
-
-	private static final long serialVersionUID = 1L;
-
-	public CtxHelpContext(CtxHelpModel model) {
-		super(model, ELEMENT_CONTEXT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getType()
-	 */
-	public int getType() {
-		return TYPE_CONTEXT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getName()
-	 */
-	public String getName() {
-		return getId();
-	}
-
-	/**
-	 * @return the value of the id attribute or <code>null</code> if the
-	 *         attribute does not exist
-	 */
-	public String getId() {
-		return getXMLAttributeValue(ATTRIBUTE_ID);
-	}
-
-	/**
-	 * Set the id attribute, passing <code>null</code> will set the attribute to
-	 * be empty.
-	 * 
-	 * @param id
-	 *            new value
-	 */
-	public void setID(String id) {
-		setXMLAttribute(ATTRIBUTE_ID, id);
-	}
-
-	/**
-	 * @return the value of the title attribute or <code>null</code> if the
-	 *         attribute does not exist
-	 */
-	public String getTitle() {
-		return getXMLAttributeValue(ATTRIBUTE_TITLE);
-	}
-
-	/**
-	 * Set the title attribute, passing <code>null</code> will set the attribute
-	 * to be empty.
-	 * 
-	 * @param title
-	 *            new value
-	 */
-	public void setTitle(String title) {
-		setXMLAttribute(ATTRIBUTE_TITLE, title);
-	}
-
-	/**
-	 * Searches for a child description node and returns the string contents of
-	 * that node. Returns <code>null</code> if no description node exists.
-	 * 
-	 * @return description associated with this context or <code>null</code> no
-	 *         description exists
-	 */
-	public String getDescription() {
-		IDocumentElementNode node = getChildNode(CtxHelpDescription.class);
-		if (node instanceof CtxHelpDescription) {
-			return ((CtxHelpDescription) node).getDescription();
-		}
-		return null;
-	}
-
-	/**
-	 * Set the description to be associated with this context. Searches for a
-	 * child description node and updates the content with the given string. If
-	 * a description node does not exist, one will be created. Passing
-	 * <code>null</code> will remove any description node if one exists.
-	 * 
-	 * @param description
-	 *            new value
-	 */
-	public void setDescription(String description) {
-		IDocumentElementNode node = getChildNode(CtxHelpDescription.class);
-		if (node instanceof CtxHelpDescription) {
-			if (description == null) {
-				removeChildNode(node, true);
-			} else {
-				((CtxHelpDescription) node).setDescription(description);
-			}
-		} else if (description != null) {
-			CtxHelpDescription newDescription = getModel().getFactory()
-					.createDescription();
-			newDescription.setDescription(description);
-			addChildNode(newDescription, 0, true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddChild(
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject)
-	 */
-	public boolean canAddChild(int objectType) {
-		return objectType == TYPE_TOPIC || objectType == TYPE_COMMAND;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.ctxhelp.CtxHelpObject#canAddSibling
-	 * (int)
-	 */
-	public boolean canAddSibling(int objectType) {
-		return objectType == TYPE_CONTEXT;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescription.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescription.java
deleted file mode 100644
index da2bedf..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescription.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-
-/**
- * Represents a description entry in context help. There may be one description
- * element for each context. A description element will contain a CDATA string
- * explaining the context that the user will see in dynamic help. Descriptions
- * are leaf objects.
- * 
- * @since 3.4
- * @see CtxHelpObject
- * @see CtxHelpModel
- * @see CtxHelpDocumentFactory
- */
-public class CtxHelpDescription extends CtxHelpObject {
-
-	private static final long serialVersionUID = 1L;
-
-	public CtxHelpDescription(CtxHelpModel model) {
-		super(model, ELEMENT_DESCRIPTION);
-	}
-	
-	protected IDocumentTextNode createDocumentTextNode() {
-		return new CtxHelpDescriptionTextNode();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.toc.TocObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getType()
-	 */
-	public int getType() {
-		return TYPE_DESCRIPTION;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getName()
-	 */
-	public String getName() {
-		return getDescription();
-	}
-
-	/**
-	 * @return the XML content of this element containing the description or
-	 *         <code>null</code>
-	 */
-	public String getDescription() {
-		return getXMLContent();
-	}
-
-	/**
-	 * Sets the XML content of this element to the given description string.
-	 * Passing <code>null</code> will set the content to be empty.
-	 * 
-	 * @param description
-	 *            new content
-	 */
-	public void setDescription(String description) {
-		setXMLContent(description);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddChild
-	 * (org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddSibling
-	 * (int)
-	 */
-	public boolean canAddSibling(int objectType) {
-		return objectType == TYPE_COMMAND || objectType == TYPE_TOPIC;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#
-	 * getTerminateIndent()
-	 */
-	protected String getTerminateIndent() {
-		return ""; //$NON-NLS-1$
-	}
-	
-	public boolean isContentCollapsed() {
-		return true;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescriptionTextNode.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescriptionTextNode.java
deleted file mode 100644
index a279b8b..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDescriptionTextNode.java
+++ /dev/null

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

- * Copyright (c) 2009 Anyware Technologies and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     Anyware Technologies - initial API and implementation

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

-

-package org.eclipse.pde.internal.ua.core.ctxhelp.text;

-

-import java.util.HashSet;

-

-import org.eclipse.pde.internal.core.text.DocumentTextNode;

-import org.eclipse.pde.internal.core.util.PDETextHelper;

-

-public class CtxHelpDescriptionTextNode extends DocumentTextNode {

-

-	private static final long serialVersionUID = 1L;

-

-	private static final HashSet TAG_EXCEPTIONS = new HashSet(2);

-

-	static {

-		TAG_EXCEPTIONS.add("b"); //$NON-NLS-1$

-		TAG_EXCEPTIONS.add("/b"); //$NON-NLS-1$

-	}

-

-	public CtxHelpDescriptionTextNode() {

-		super();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.pde.internal.core.text.DocumentTextNode#write()

-	 */

-	public String write() {

-		String content = getText().trim();

-		return PDETextHelper.translateWriteText(content, TAG_EXCEPTIONS,

-				SUBSTITUTE_CHARS);

-	}

-

-}


diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java
deleted file mode 100644
index b18feb6..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentFactory.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-import org.eclipse.pde.internal.core.text.DocumentNodeFactory;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentNodeFactory;
-import org.eclipse.pde.internal.ua.core.ctxhelp.ICtxHelpConstants;
-
-/**
- * Handles the creation of document nodes representing the types of elements
- * that can exist in a context help xml file.
- * 
- * @since 3.4
- * @see CtxHelpObject
- * @see CtxHelpModel
- * @see CtxHelpDocumentHandler
- */
-public class CtxHelpDocumentFactory extends DocumentNodeFactory implements
-		IDocumentNodeFactory {
-	private CtxHelpModel fModel;
-
-	public CtxHelpDocumentFactory(CtxHelpModel model) {
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.IDocumentNodeFactory#createDocumentNode
-	 * (java.lang.String,
-	 * org.eclipse.pde.internal.core.text.IDocumentElementNode)
-	 */
-	public IDocumentElementNode createDocumentNode(String name,
-			IDocumentElementNode parent) {
-		if (isRoot(name)) { // Root
-			return createRoot();
-		}
-		if (isContext(name)) { // Context
-			return createContext();
-		}
-		if (isDescription(name)) { // Link
-			return createDescription();
-		}
-		if (isTopic(name)) { // Anchor
-			return createTopic();
-		}
-		if (isCommand(name)) { // Anchor
-			return createCommand();
-		}
-		return super.createDocumentNode(name, parent);
-	}
-
-	private boolean isRoot(String name) {
-		return name.equals(ICtxHelpConstants.ELEMENT_ROOT);
-	}
-
-	private boolean isContext(String name) {
-		return name.equals(ICtxHelpConstants.ELEMENT_CONTEXT);
-	}
-
-	private boolean isDescription(String name) {
-		return name.equals(ICtxHelpConstants.ELEMENT_DESCRIPTION);
-	}
-
-	private boolean isTopic(String name) {
-		return name.equals(ICtxHelpConstants.ELEMENT_TOPIC);
-	}
-
-	private boolean isCommand(String name) {
-		return name.equals(ICtxHelpConstants.ELEMENT_COMMAND);
-	}
-
-	/**
-	 * @return a new root object based on the current model
-	 */
-	public CtxHelpRoot createRoot() {
-		return new CtxHelpRoot(fModel);
-	}
-
-	/**
-	 * @return a new context object based on the current model
-	 */
-	public CtxHelpContext createContext() {
-		return new CtxHelpContext(fModel);
-	}
-
-	/**
-	 * @return a new description object based on the current model
-	 */
-	public CtxHelpDescription createDescription() {
-		return new CtxHelpDescription(fModel);
-	}
-
-	/**
-	 * @return a new topic object based on the current model
-	 */
-	public CtxHelpTopic createTopic() {
-		return new CtxHelpTopic(fModel);
-	}
-
-	/**
-	 * @return a new command object based on the current model
-	 */
-	public CtxHelpCommand createCommand() {
-		return new CtxHelpCommand(fModel);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java
deleted file mode 100644
index 3376607..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpDocumentHandler.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.NodeDocumentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * Document handler for context help xml files.
- * 
- * @since 3.4
- * @see CtxHelpObject
- * @see CtxHelpModel
- * @see CtxHelpDocumentFactory
- */
-public class CtxHelpDocumentHandler extends NodeDocumentHandler {
-
-	private CtxHelpModel fModel;
-
-	public CtxHelpDocumentHandler(CtxHelpModel model, boolean reconciling) {
-		super(reconciling, model.getFactory());
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.DocumentHandler#getDocument()
-	 */
-	protected IDocument getDocument() {
-		return fModel.getDocument();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.NodeDocumentHandler#getRootNode()
-	 */
-	protected IDocumentElementNode getRootNode() {
-		return (IDocumentElementNode) fModel.getRoot();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.text.DocumentHandler#startDocument()
-	 */
-	public void startDocument() throws SAXException {
-		//starting fresh parsing, clean the known errors
-		fModel.purgeErrors();
-		super.startDocument();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#endDocument()
-	 */
-	public void endDocument() throws SAXException {
-		//reached the document end, refresh the markers (if any)
-		super.endDocument();
-		if (fModel.isMarkerRefreshNeeded()) {
-			CtxHelpMarkerManager.refreshMarkers(fModel);
-			fModel.setMarkerRefreshNeeded(false);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.text.DocumentHandler#error(org.xml.sax.SAXParseException)
-	 */
-	public void error(SAXParseException e) throws SAXException {
-		//error are recoverable so add it and continue
-		fModel.addError(e);
-		super.error(e);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.text.DocumentHandler#fatalError(org.xml.sax.SAXParseException)
-	 */
-	public void fatalError(SAXParseException e) throws SAXException {
-		//fatalError are not recoverable, so add it and refresh the marker as the document won't be parsed further
-		fModel.addError(e);
-		super.fatalError(e);
-		if (fModel.isMarkerRefreshNeeded()) {
-			CtxHelpMarkerManager.refreshMarkers(fModel);
-			fModel.setMarkerRefreshNeeded(false);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpMarkerManager.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpMarkerManager.java
deleted file mode 100644
index 4a73d9c..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpMarkerManager.java
+++ /dev/null

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

- * Copyright (c) 2009 IBM Corporation and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

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

-

-package org.eclipse.pde.internal.ua.core.ctxhelp.text;

-

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

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

-import org.xml.sax.SAXParseException;

-

-/**

- * Manages markers for xml problems in the context help editor

- */

-public class CtxHelpMarkerManager {

-

-	public static void refreshMarkers(CtxHelpModel model) {

-		deleteMarkers(model);

-		createMarkers(model);

-	}

-

-	public static void deleteMarkers(CtxHelpModel model) {

-		try {

-			IMarker[] problems = model.getUnderlyingResource().findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);

-			if (problems != null) {

-				for (int index = 0; index < problems.length; index++) {

-					problems[index].delete();

-				}

-			}

-		} catch (CoreException e) {

-		}

-

-	}

-

-	public static void createMarkers(CtxHelpModel model) {

-		Collection errors = model.getErrors();

-		if (errors == null || errors.size() == 0) {

-			return;

-		}

-

-		Iterator iter = errors.iterator();

-		while (iter.hasNext()) {

-			Throwable exception = (Throwable) iter.next();

-			if (exception instanceof SAXParseException) {

-				int line = ((SAXParseException) exception).getLineNumber();

-				try {

-

-					IMarker marker = model.getUnderlyingResource().createMarker(IMarker.PROBLEM);

-

-					marker.setAttribute(IMarker.LINE_NUMBER, line);

-					marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);

-					marker.setAttribute(IMarker.MESSAGE, exception.getLocalizedMessage());

-				} catch (CoreException e) {

-				}

-			}

-		}

-	}

-}


diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpModel.java
deleted file mode 100644
index 7e7142e..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpModel.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IWritable;
-import org.eclipse.pde.internal.core.NLResourceHelper;
-import org.eclipse.pde.internal.core.text.XMLEditingModel;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Model describing the elements of a context help xml file.
- * 
- * @since 3.4
- * @see CtxHelpRoot
- * @see CtxHelpDocumentFactory
- * @see CtxHelpDocumentHandler
- */
-public class CtxHelpModel extends XMLEditingModel {
-
-	private CtxHelpDocumentHandler fHandler;
-	private CtxHelpDocumentFactory fFactory;
-	private CtxHelpRoot fRoot;
-	private List fErrors;
-	private boolean fMarkerRefreshNeeded;
-
-	public CtxHelpModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.XMLEditingModel#createDocumentHandler
-	 * (org.eclipse.pde.core.IModel, boolean)
-	 */
-	protected DefaultHandler createDocumentHandler(IModel model, boolean reconciling) {
-		if (fHandler == null) {
-			fHandler = new CtxHelpDocumentHandler(this, reconciling);
-		}
-		return fHandler;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.AbstractEditingModel#
-	 * createNLResourceHelper()
-	 */
-	protected NLResourceHelper createNLResourceHelper() {
-		// Not needed
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ITocModel#getFactory()
-	 */
-	public CtxHelpDocumentFactory getFactory() {
-		if (fFactory == null) {
-			fFactory = new CtxHelpDocumentFactory(this);
-		}
-		return fFactory;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ITocModel#getToc()
-	 */
-	public CtxHelpRoot getCtxHelpRoot() {
-		if (fRoot == null) {
-			fRoot = getFactory().createRoot();
-		}
-		return fRoot;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.XMLEditingModel#getRoot()
-	 */
-	protected IWritable getRoot() {
-		return getCtxHelpRoot();
-	}
-
-	public void addError(Exception e) {
-		if (fErrors == null) {
-			fErrors = new ArrayList(1);
-		}
-		if (!fErrors.contains(e)) {
-			fErrors.add(e);
-		}
-	}
-
-	public Collection getErrors() {
-		return fErrors;
-	}
-
-	public void purgeErrors() {
-		if (fErrors != null) {
-			fErrors.clear();
-		}
-	}
-
-	public void setMarkerRefreshNeeded(boolean refresh) {
-		this.fMarkerRefreshNeeded = refresh;
-	}
-
-	public boolean isMarkerRefreshNeeded() {
-		return fMarkerRefreshNeeded;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpObject.java
deleted file mode 100644
index 31fdb65..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpObject.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.core.text.DocumentObject;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.ctxhelp.ICtxHelpConstants;
-
-/**
- * All modeled objects of a context help xml file must extend from this abstract
- * class.
- * 
- * @since 3.4
- * @see CtxHelpModel
- * @see CtxHelpDocumentFactory
- */
-public abstract class CtxHelpObject extends DocumentObject implements
-		ICtxHelpConstants, Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs the CtxHelpObject and initializes its attributes.
-	 * 
-	 * @param model
-	 *            The model to associate with this CtxHelpObject
-	 * @param tagName
-	 *            The xml tag name for this object
-	 */
-	public CtxHelpObject(CtxHelpModel model, String tagName) {
-		super(model, tagName);
-	}
-
-	/**
-	 * @return the children of the object or an empty List if none exist.
-	 */
-	public List getChildren() {
-		// Create a copy of the child list instead of
-		// returning the list itself. That way, our list
-		// of children cannot be altered from outside
-		ArrayList list = new ArrayList();
-
-		// Add children of this topic
-		IDocumentElementNode[] childNodes = getChildNodes();
-		if (childNodes.length > 0) {
-			for (int i = 0; i < childNodes.length; ++i) {
-				if (childNodes[i] instanceof CtxHelpObject) {
-					list.add(childNodes[i]);
-				}
-			}
-		}
-
-		return list;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.DocumentElementNode#getAttributeIndent
-	 * ()
-	 */
-	protected String getAttributeIndent() {
-		return " "; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.DocumentElementNode#getContentIndent()
-	 */
-	protected String getContentIndent() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.DocumentElementNode#isLeafNode()
-	 */
-	public boolean isLeafNode() {
-		return !canBeParent();
-	}
-
-	/**
-	 * @return true if this object is capable of containing children.
-	 */
-	public abstract boolean canBeParent();
-
-	public abstract boolean canAddChild(int objectType);
-
-	public abstract boolean canAddSibling(int objectType);
-
-	// public abstract boolean canAddSibling(int objectType);
-
-	public void addChild(CtxHelpObject newObject, CtxHelpObject targetSibling,
-			boolean insertBefore) {
-		if (canAddChild(newObject.getType())) {
-			int currentIndex = indexOf(targetSibling);
-			if (!insertBefore) {
-				currentIndex++;
-			}
-			addChildNode(newObject, currentIndex, true);
-		}
-	}
-
-	public void addChild(CtxHelpObject newObject) {
-		if (canAddChild(newObject.getType())) {
-			addChildNode(newObject, true);
-		}
-	}
-
-	/**
-	 * @return the root model object that is an ancestor to this object.
-	 */
-	public CtxHelpModel getModel() {
-		final IModel sharedModel = getSharedModel();
-		if (sharedModel instanceof CtxHelpModel) {
-			return (CtxHelpModel) sharedModel;
-		}
-		return null;
-	}
-
-	/**
-	 * @return the root element that is an ancestor to this object.
-	 */
-	public CtxHelpRoot getRoot() {
-		final CtxHelpModel model = getModel();
-		if (model != null) {
-			return model.getCtxHelpRoot();
-		}
-		return null;
-	}
-
-	/**
-	 * @return the identifier for this object to be used when displaying the
-	 *         element to the user
-	 */
-	public abstract String getName();
-
-	/**
-	 * Get the concrete type of this object, must be one of the TYPE constants
-	 * defined in ICtxHelpConstants.
-	 * 
-	 * @see ICtxHelpConstants
-	 */
-	public abstract int getType();
-
-	/**
-	 * @return the parent of this object, or <code>null</code> if there is no
-	 *         parent.
-	 */
-	public CtxHelpObject getParent() {
-		IDocumentElementNode parent = getParentNode();
-		return parent instanceof CtxHelpObject ? (CtxHelpObject) parent : null;
-	}
-
-	/**
-	 * Check if the object is a direct or indirect descendant of the object
-	 * parameter.
-	 * 
-	 * @param obj
-	 *            The object to find in this object's ancestry
-	 * @return true iff obj is an ancestor of this object
-	 */
-	public boolean descendsFrom(CtxHelpObject obj) {
-		if (this.equals(obj)) {
-			return true;
-		}
-		if (getParent() != null && obj.canBeParent()) {
-			return getParent().descendsFrom(obj);
-		}
-		return false;
-	}
-
-	/**
-	 * @param ctxHelpObject
-	 *            the child used to locate a sibling
-	 * @return the object preceding the specified one in the list of children
-	 */
-	public CtxHelpObject getPreviousSibling(CtxHelpObject ctxHelpObject) {
-		return (CtxHelpObject) getPreviousSibling(ctxHelpObject,
-				CtxHelpObject.class);
-	}
-
-	/**
-	 * @param ctxHelpObject
-	 *            the child used to locate a sibling
-	 * @return the object proceeding the specified one in the list of children
-	 */
-	public CtxHelpObject getNextSibling(CtxHelpObject ctxHelpObject) {
-		return (CtxHelpObject) getNextSibling(ctxHelpObject,
-				CtxHelpObject.class);
-	}
-
-	/**
-	 * @return true iff a this object can be removed
-	 */
-	public boolean canBeRemoved() {
-		if (getType() == TYPE_ROOT) { // Semantic Rule: The root element can
-										// never be removed
-			return false;
-		}
-		return true;
-	}
-
-	public void removeChild(CtxHelpObject object) {
-		if (object.canBeRemoved()) {
-			removeChildNode(object, true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.toc.TocObject#moveChild(org.eclipse.pde
-	 * .internal.core.toc.TocObject, int)
-	 */
-	public void moveChild(CtxHelpObject object, int newRelativeIndex) {
-		moveChildNode(object, newRelativeIndex, true);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpRoot.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpRoot.java
deleted file mode 100644
index 44f3f05..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpRoot.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-/**
- * Represents the root "contexts" entry in a context help xml file. There may be
- * only one root node in the file and all other nodes must be inside the root.
- * The root may contain many context elements.
- * 
- * @since 3.4
- * @see CtxHelpObject
- * @see CtxHelpModel
- * @see CtxHelpDocumentFactory
- */
-public class CtxHelpRoot extends CtxHelpObject {
-
-	private static final long serialVersionUID = 1L;
-
-	public CtxHelpRoot(CtxHelpModel model) {
-		super(model, ELEMENT_ROOT);
-		setInTheModel(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#isRoot()
-	 */
-	public boolean isRoot() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getType()
-	 */
-	public int getType() {
-		return TYPE_ROOT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getName()
-	 */
-	public String getName() {
-		return ELEMENT_ROOT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddChild
-	 * (org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject)
-	 */
-	public boolean canAddChild(int objectType) {
-		return objectType == TYPE_CONTEXT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddSibling
-	 * (int)
-	 */
-	public boolean canAddSibling(int objectType) {
-		return false;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpTopic.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpTopic.java
deleted file mode 100644
index 262061d..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/ctxhelp/text/CtxHelpTopic.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.core.ctxhelp.text;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * Represents a topic entry in context help. Topics are used to open related
- * help in other files. Topics are leaf objects.
- * 
- * @since 3.4
- * @see CtxHelpObject
- * @see CtxHelpModel
- * @see CtxHelpDocumentFactory
- */
-public class CtxHelpTopic extends CtxHelpObject {
-
-	private static final long serialVersionUID = 1L;
-
-	public CtxHelpTopic(CtxHelpModel model) {
-		super(model, ELEMENT_TOPIC);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getType()
-	 */
-	public int getType() {
-		return TYPE_TOPIC;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#getName()
-	 */
-	public String getName() {
-		return getLabel();
-	}
-
-	/**
-	 * @return the value of the label attribute or <code>null</code> if the
-	 *         attribute does not exist
-	 */
-	public String getLabel() {
-		return getXMLAttributeValue(ATTRIBUTE_LABEL);
-	}
-
-	/**
-	 * Set the label attribute, passing <code>null</code> will set the attribute
-	 * to be empty.
-	 * 
-	 * @param label
-	 *            new value
-	 */
-	public void setLabel(String label) {
-		setXMLAttribute(ATTRIBUTE_LABEL, label);
-	}
-
-	/**
-	 * @return the value of the href attribute as a path or <code>null</code>
-	 */
-	public IPath getLocation() {
-		String value = getXMLAttributeValue(ATTRIBUTE_HREF);
-		if (value != null) {
-			return new Path(value);
-		}
-		return null;
-	}
-
-	/**
-	 * Set the href (link) attribute, passing <code>null</code> will set the
-	 * attribute to be empty.
-	 * 
-	 * @param path
-	 *            new value
-	 */
-	public void setLocation(IPath path) {
-		if (path == null) {
-			setXMLAttribute(ATTRIBUTE_HREF, null);
-		} else {
-			setXMLAttribute(ATTRIBUTE_HREF, path.toPortableString());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddChild
-	 * (org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject)
-	 */
-	public boolean canAddChild(int objectType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject#canAddSibling
-	 * (int)
-	 */
-	public boolean canAddSibling(int objectType) {
-		return objectType == TYPE_COMMAND || objectType == TYPE_TOPIC;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/ICSConstants.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/ICSConstants.java
deleted file mode 100644
index 5c7e6c7..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/ICSConstants.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet;
-
-public interface ICSConstants {
-
-	// Attribute Values
-	// TODO: MP: TEO: LOW: Delete all contstants once migration is complete
-
-	public static final String ATTRIBUTE_VALUE_ENCODING = "UTF-8"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_VALUE_TRUE = "true"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_VALUE_FALSE = "false"; //$NON-NLS-1$
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCS.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCS.java
deleted file mode 100644
index c7367c8..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCS.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-public interface ICompCS extends ICompCSObject {
-
-	/**
-	 * Attribute: name
-	 * 
-	 * @param name
-	 */
-	public void setFieldName(String name);
-
-	/**
-	 * Attribute: name
-	 * 
-	 * @return
-	 */
-	public String getFieldName();
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObject
-	 */
-	public void setFieldTaskObject(ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @return
-	 */
-	public ICompCSTaskObject getFieldTaskObject();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSConstants.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSConstants.java
deleted file mode 100644
index 8ef277b..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSConstants.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Gaetano Santoro <gaetano.santoro@st.com> - Bug 211754
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.ICSConstants;
-
-/**
- * ICompCSConstants
- * 
- */
-public interface ICompCSConstants extends ICSConstants {
-
-	// Elements
-
-	public static final String ELEMENT_COMPOSITE_CHEATSHEET = "compositeCheatsheet"; //$NON-NLS-1$
-
-	public static final String ELEMENT_TASKGROUP = "taskGroup"; //$NON-NLS-1$
-
-	public static final String ELEMENT_TASK = "task"; //$NON-NLS-1$
-
-	public static final String ELEMENT_INTRO = "intro"; //$NON-NLS-1$
-
-	public static final String ELEMENT_ONCOMPLETION = "onCompletion"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_DEPENDENCY = "dependsOn"; //$NON-NLS-1$	
-
-	public static final String ELEMENT_PARAM = "param"; //$NON-NLS-1$	
-
-	// Attributes
-
-	public static final String ATTRIBUTE_KIND = "kind"; //$NON-NLS-1$		
-
-	public static final String ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$		
-
-	public static final String ATTRIBUTE_SKIP = "skip"; //$NON-NLS-1$		
-
-	public static final String ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_TASK = ELEMENT_TASK;
-
-	// Attribute Values:
-	// Element: param
-	// Attribute: name
-
-	public static final String ATTRIBUTE_VALUE_ID = ATTRIBUTE_ID;
-
-	public static final String ATTRIBUTE_VALUE_PATH = "path"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_VALUE_SHOWINTRO = "showIntro"; //$NON-NLS-1$
-
-	// Attribute Values:
-	// Element: taskGroup
-	// Attribute: kind
-
-	public static final String ATTRIBUTE_VALUE_SET = "set"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_VALUE_SEQUENCE = "sequence"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_VALUE_CHOICE = "choice"; //$NON-NLS-1$
-
-	// Attribute Values:
-	// Element: task
-	// Attribute: kind
-
-	public static final String ATTRIBUTE_VALUE_CHEATSHEET = "cheatsheet"; //$NON-NLS-1$
-
-	// Types
-
-	public static final int TYPE_COMPOSITE_CHEATSHEET = 0;
-
-	public static final int TYPE_TASKGROUP = 1;
-
-	public static final int TYPE_TASK = 2;
-
-	public static final int TYPE_INTRO = 3;
-
-	public static final int TYPE_ONCOMPLETION = 4;
-
-	public static final int TYPE_DEPENDENCY = 5;
-
-	public static final int TYPE_PARAM = 6;
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDataObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDataObject.java
deleted file mode 100644
index e8e7142..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDataObject.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-/**
- * ICompCSDataObject
- * 
- */
-public interface ICompCSDataObject extends ICompCSObject {
-
-	/**
-	 * PCDATA
-	 * 
-	 * @param content
-	 */
-	public void setFieldContent(String content);
-
-	/**
-	 * PCDATA
-	 * 
-	 * @return
-	 */
-	public String getFieldContent();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDependency.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDependency.java
deleted file mode 100644
index 37e0994..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSDependency.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-/**
- * ICompCSDependency
- * 
- */
-public interface ICompCSDependency extends ICompCSObject {
-
-	/**
-	 * Attribute: task
-	 * 
-	 * @param task
-	 */
-	public void setFieldTask(String task);
-
-	/**
-	 * Attribute: task
-	 * 
-	 * @return
-	 */
-	public String getFieldTask();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSIntro.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSIntro.java
deleted file mode 100644
index 9e70c6c..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSIntro.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-/**
- * ICompCSIntro
- * 
- */
-public interface ICompCSIntro extends ICompCSDataObject {
-	// Nothing
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModel.java
deleted file mode 100644
index 4150f4c..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModel.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangeProvider;
-
-/**
- * ICompCSModel
- * 
- */
-public interface ICompCSModel extends IModelChangeProvider, IModel {
-
-	/**
-	 * @return
-	 */
-	ICompCS getCompCS();
-
-	/**
-	 * @return
-	 */
-	ICompCSModelFactory getFactory();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModelFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModelFactory.java
deleted file mode 100644
index 6bf6fd4..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSModelFactory.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-public interface ICompCSModelFactory {
-
-	/**
-	 * @return
-	 */
-	public ICompCS createCompCS();
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public ICompCSTaskGroup createCompCSTaskGroup(ICompCSObject parent);
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public ICompCSTask createCompCSTask(ICompCSObject parent);
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public ICompCSIntro createCompCSIntro(ICompCSObject parent);
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public ICompCSOnCompletion createCompCSOnCompletion(ICompCSObject parent);
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public ICompCSDependency createCompCSDependency(ICompCSObject parent);
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public ICompCSParam createCompCSParam(ICompCSObject parent);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSObject.java
deleted file mode 100644
index 63bffa8..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSObject.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.eclipse.pde.core.IWritable;
-import org.w3c.dom.Element;
-
-public interface ICompCSObject extends Serializable, IWritable,
-		ICompCSConstants {
-
-	/**
-	 * @return
-	 */
-	ICompCSModel getModel();
-
-	/**
-	 * @param model
-	 */
-	void setModel(ICompCSModel model);
-
-	/**
-	 * @return
-	 */
-	ICompCS getCompCS();
-
-	/**
-	 * @param element
-	 */
-	void parse(Element element);
-
-	/**
-	 * 
-	 */
-	public void reset();
-
-	/**
-	 * To avoid using instanceof all over the place
-	 * 
-	 * @return
-	 */
-	public int getType();
-
-	/**
-	 * For the label provider
-	 * 
-	 * @return
-	 */
-	public String getName();
-
-	/**
-	 * For the content provider
-	 * 
-	 * @return A empty / non-empty list - never null
-	 */
-	public List getChildren();
-
-	/**
-	 * @return
-	 */
-	public ICompCSObject getParent();
-
-	/**
-	 * @return
-	 */
-	public String getElement();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSOnCompletion.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSOnCompletion.java
deleted file mode 100644
index 550ff8c..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSOnCompletion.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-public interface ICompCSOnCompletion extends ICompCSDataObject {
-	// Nothing
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSParam.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSParam.java
deleted file mode 100644
index b47b2cb..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSParam.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-public interface ICompCSParam extends ICompCSObject {
-
-	/**
-	 * Attribute: name
-	 * 
-	 * @param name
-	 */
-	public void setFieldName(String name);
-
-	/**
-	 * Attribute: name
-	 * 
-	 * @return
-	 */
-	public String getFieldName();
-
-	/**
-	 * Attribute: value
-	 * 
-	 * @param value
-	 */
-	public void setFieldValue(String value);
-
-	/**
-	 * Attribute: value
-	 * 
-	 * @return
-	 */
-	public String getFieldValue();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTask.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTask.java
deleted file mode 100644
index 7c0252d..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTask.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-public interface ICompCSTask extends ICompCSTaskObject {
-
-	/**
-	 * Element: param
-	 * 
-	 * @param param
-	 */
-	public void addFieldParam(ICompCSParam param);
-
-	/**
-	 * Element: param
-	 * 
-	 * @param param
-	 */
-	public void removeFieldParam(ICompCSParam param);
-
-	/**
-	 * Element: param
-	 * 
-	 * @return
-	 */
-	public ICompCSParam[] getFieldParams();
-
-	/**
-	 * Element: param
-	 * 
-	 * @return
-	 */
-	public boolean hasFieldParams();
-
-	/**
-	 * Element: param
-	 * 
-	 * @param name
-	 * @return
-	 */
-	public ICompCSParam getFieldParam(String name);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskGroup.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskGroup.java
deleted file mode 100644
index ef6a995..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskGroup.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-public interface ICompCSTaskGroup extends ICompCSTaskObject {
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObject
-	 */
-	public void addFieldTaskObject(ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param index
-	 * @param taskObject
-	 */
-	public void addFieldTaskObject(int index, ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObject
-	 * @return
-	 */
-	public void removeFieldTaskObject(ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObject
-	 * @param newRelativeIndex
-	 */
-	public void moveFieldTaskObject(ICompCSTaskObject taskObject,
-			int newRelativeIndex);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param index
-	 * @return
-	 */
-	public void removeFieldTaskObject(int index);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @return
-	 */
-	public ICompCSTaskObject[] getFieldTaskObjects();
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param subitem
-	 * @return
-	 */
-	public boolean isFirstFieldTaskObject(ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObject
-	 * @return
-	 */
-	public boolean isLastFieldTaskObject(ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObjectm
-	 * @return
-	 */
-	public int indexOfFieldTaskObject(ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @return
-	 */
-	public int getFieldTaskObjectCount();
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @return
-	 */
-	public boolean hasFieldTaskObjects();
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObject
-	 * @return
-	 */
-	public ICompCSTaskObject getNextSibling(ICompCSTaskObject taskObject);
-
-	/**
-	 * Elements: taskGroup, task
-	 * 
-	 * @param taskObject
-	 * @return
-	 */
-	public ICompCSTaskObject getPreviousSibling(ICompCSTaskObject taskObject);
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskObject.java
deleted file mode 100644
index b80b4a1..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/icheatsheet/comp/ICompCSTaskObject.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.icheatsheet.comp;
-
-public interface ICompCSTaskObject extends ICompCSObject {
-
-	/**
-	 * Attribute: kind
-	 * 
-	 * @param kind
-	 */
-	public void setFieldKind(String kind);
-
-	/**
-	 * Attribute: kind
-	 * 
-	 * @return
-	 */
-	public String getFieldKind();
-
-	/**
-	 * Attribute: name
-	 * 
-	 * @param name
-	 */
-	public void setFieldName(String name);
-
-	/**
-	 * Attribute: name
-	 * 
-	 * @return
-	 */
-	public String getFieldName();
-
-	/**
-	 * Attribute: id
-	 * 
-	 * @param id
-	 */
-	public void setFieldId(String id);
-
-	/**
-	 * Attribute: id
-	 * 
-	 * @return
-	 */
-	public String getFieldId();
-
-	/**
-	 * Attribute: skip
-	 * 
-	 * @param skip
-	 */
-	public void setFieldSkip(boolean skip);
-
-	/**
-	 * Attribute: skip
-	 * 
-	 * @return
-	 */
-	public boolean getFieldSkip();
-
-	/**
-	 * Element: onCompletion
-	 * 
-	 * @param onCompletion
-	 */
-	public void setFieldOnCompletion(ICompCSOnCompletion onCompletion);
-
-	/**
-	 * Element: onCompletion
-	 * 
-	 * @return
-	 */
-	public ICompCSOnCompletion getFieldOnCompletion();
-
-	/**
-	 * Element: intro
-	 * 
-	 * @param intro
-	 */
-	public void setFieldIntro(ICompCSIntro intro);
-
-	/**
-	 * Element: intro
-	 * 
-	 * @return
-	 */
-	public ICompCSIntro getFieldIntro();
-
-	/**
-	 * Element: dependency
-	 * 
-	 * @param dependency
-	 */
-	public void addFieldDependency(ICompCSDependency dependency);
-
-	/**
-	 * Element: dependency
-	 * 
-	 * @param dependency
-	 */
-	public void removeFieldDepedency(ICompCSDependency dependency);
-
-	/**
-	 * Element: dependency
-	 * 
-	 * @return
-	 */
-	public ICompCSDependency[] getFieldDependencies();
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/ITocConstants.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/ITocConstants.java
deleted file mode 100644
index 1186534..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/ITocConstants.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc;
-
-/**
- * ITocConstants This interface contains all of the constants relevant to the
- * TOC editor
- * 
- * @since 3.4
- */
-public interface ITocConstants {
-
-	// Elements
-
-	public static final String ELEMENT_TOC = "toc"; //$NON-NLS-1$
-
-	public static final String ELEMENT_TOPIC = "topic"; //$NON-NLS-1$
-
-	public static final String ELEMENT_ANCHOR = "anchor"; //$NON-NLS-1$
-
-	public static final String ELEMENT_LINK = "link"; //$NON-NLS-1$
-
-	// Attributes
-
-	public static final String ATTRIBUTE_LINK_TO = "link_to"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_LABEL = "label"; //$NON-NLS-1$		
-
-	public static final String ATTRIBUTE_TOPIC = ELEMENT_TOPIC;
-
-	public static final String ATTRIBUTE_HREF = "href"; //$NON-NLS-1$		
-
-	public static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-
-	public static final String ATTRIBUTE_TOC = ELEMENT_TOC;
-
-	// Types
-
-	public static final int TYPE_TOC = 0;
-
-	public static final int TYPE_TOPIC = 1;
-
-	public static final int TYPE_ANCHOR = 2;
-
-	public static final int TYPE_LINK = 3;
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/Toc.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/Toc.java
deleted file mode 100644
index 494c507..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/Toc.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-/**
- * Toc - represents the root element of a Table of Contents The TOC root
- * element, like TOC topics, can hold many child topics, links and anchors.
- * Aside from being the root element of the TOC, the element differs from
- * regular topics by having an optional anchor attribute that determines which
- * anchors this TOC will plug into.
- */
-public class Toc extends TocTopic {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs a new Toc. Only takes a model, since the root element cannot
-	 * have a parent.
-	 * 
-	 * @param model
-	 *            The model associated with this TOC.
-	 */
-	public Toc(TocModel model) {
-		super(model, ELEMENT_TOC);
-		setInTheModel(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#isRoot()
-	 */
-	public boolean isRoot() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#getType()
-	 */
-	public int getType() {
-		return TYPE_TOC;
-	}
-
-	/**
-	 * @return the link associated with this topic, <br />
-	 *         or <code>null</code> if none exists.
-	 */
-	public String getFieldRef() {
-		return getXMLAttributeValue(ATTRIBUTE_TOPIC);
-	}
-
-	/**
-	 * Change the value of the link field and signal a model change if needed.
-	 * 
-	 * @param value
-	 *            The new page location to be linked by this topic
-	 */
-	public void setFieldRef(String value) {
-		setXMLAttribute(ATTRIBUTE_TOPIC, value);
-	}
-
-	/**
-	 * @return the anchor path associated with this TOC
-	 */
-	public String getFieldAnchorTo() {
-		return getXMLAttributeValue(ATTRIBUTE_LINK_TO);
-	}
-
-	/**
-	 * Change the value of the anchor field and signal a model change if needed.
-	 * 
-	 * @param The
-	 *            new anchor path to associate with this TOC
-	 */
-	public void setFieldAnchorTo(String name) {
-		setXMLAttribute(ATTRIBUTE_LINK_TO, name);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocAnchor.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocAnchor.java
deleted file mode 100644
index 3ef3c90..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocAnchor.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-/**
- * The TocAnchor class represents an anchor, which is used as a point of
- * inclusion for other tables of contents. For instance, if TOC A contains the
- * anchor with ID "PDE" and TOC B has the "PDE" ID in its link_to attribute,
- * then the contents of TOC B will replace the anchor specified by TOC A at
- * runtime.
- * 
- * TOC anchors cannot have any content within them, so they are leaf objects.
- */
-public class TocAnchor extends TocObject {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs an anchor with the given model and parent.
-	 * 
-	 * @param parent
-	 *            The parent TocObject of the new anchor.
-	 */
-	public TocAnchor(TocModel model) {
-		super(model, ELEMENT_ANCHOR);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.toc.TocObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#getType()
-	 */
-	public int getType() {
-		return TYPE_ANCHOR;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#getName()
-	 */
-	public String getName() {
-		return getFieldAnchorId();
-	}
-
-	public String getPath() {
-		// Since the anchor is never associated with any file,
-		// the path is null.
-		return null;
-	}
-
-	/**
-	 * @return the ID of this anchor
-	 */
-	public String getFieldAnchorId() {
-		return getXMLAttributeValue(ATTRIBUTE_ID);
-	}
-
-	/**
-	 * Change the value of the anchor ID and signal a model change if needed.
-	 * 
-	 * @param id
-	 *            The new ID to associate with the anchor
-	 */
-	public void setFieldAnchorId(String id) {
-		setXMLAttribute(ATTRIBUTE_ID, id);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java
deleted file mode 100644
index dd2c3c8..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentFactory.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.pde.internal.core.text.DocumentNodeFactory;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentNodeFactory;
-import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
-
-public class TocDocumentFactory extends DocumentNodeFactory implements
-		IDocumentNodeFactory {
-	private TocModel fModel;
-
-	/**
-	 * @param model
-	 */
-	public TocDocumentFactory(TocModel model) {
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.IDocumentNodeFactory#createDocumentNode
-	 * (java.lang.String,
-	 * org.eclipse.pde.internal.core.text.IDocumentElementNode)
-	 */
-	public IDocumentElementNode createDocumentNode(String name,
-			IDocumentElementNode parent) {
-
-		// Semantics:
-		// org.eclipse.platform.doc.isv/reference/extension-points/org_eclipse_help_toc.html
-
-		if (isToc(name)) { // Root
-			return (IDocumentElementNode) createToc();
-		}
-
-		if (isTopic(name)) { // Topic
-			return (IDocumentElementNode) createTocTopic();
-		}
-
-		if (isLink(name)) { // Link
-			return (IDocumentElementNode) createTocLink();
-		}
-
-		if (isAnchor(name)) { // Anchor
-			return (IDocumentElementNode) createTocAnchor();
-		}
-
-		return super.createDocumentNode(name, parent);
-	}
-
-	/**
-	 * @param name
-	 * @param elementName
-	 * @return
-	 */
-	private boolean isTocElement(String name, String elementName) {
-		if (name.equals(elementName)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isToc(String name) {
-		return isTocElement(name, ITocConstants.ELEMENT_TOC);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isAnchor(String name) {
-		return isTocElement(name, ITocConstants.ELEMENT_ANCHOR);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isTopic(String name) {
-		return isTocElement(name, ITocConstants.ELEMENT_TOPIC);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private boolean isLink(String name) {
-		return isTocElement(name, ITocConstants.ELEMENT_LINK);
-	}
-
-	/**
-	 * @return
-	 */
-	public Toc createToc() {
-		return new Toc(fModel);
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public TocTopic createTocTopic() {
-		return new TocTopic(fModel);
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public TocLink createTocLink() {
-		return new TocLink(fModel);
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public TocTopic createTocTopic(IFile file) {
-		return new TocTopic(fModel, file);
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public TocLink createTocLink(IFile file) {
-		return new TocLink(fModel, file);
-	}
-
-	/**
-	 * @return
-	 */
-	public TocAnchor createTocAnchor() {
-		return new TocAnchor(fModel);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java
deleted file mode 100644
index 20718ed..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocDocumentHandler.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.NodeDocumentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class TocDocumentHandler extends NodeDocumentHandler {
-
-	private TocModel fModel;
-
-	/**
-	 * @param reconciling
-	 */
-	public TocDocumentHandler(TocModel model, boolean reconciling) {
-		super(reconciling, model.getFactory());
-		fModel = model;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.DocumentHandler#getDocument()
-	 */
-	protected IDocument getDocument() {
-		return fModel.getDocument();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.NodeDocumentHandler#getRootNode()
-	 */
-	protected IDocumentElementNode getRootNode() {
-		return (IDocumentElementNode) fModel.getToc();
-	}
-
-	public void startDocument() throws SAXException {
-		//starting fresh parsing, clean the known errors
-		fModel.purgeErrors();
-		super.startDocument();
-	}
-
-	public void endDocument() throws SAXException {
-		//reached the document end, refresh the markers (if any)
-		super.endDocument();
-		if (fModel.isMarkerRefreshNeeded()) {
-			TocMarkerManager.refreshMarkers(fModel);
-			fModel.setMarkerRefreshNeeded(false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.DocumentHandler#error(org.xml.sax.SAXParseException)
-	 */
-	public void error(SAXParseException e) throws SAXException {
-		//error are recoverable so add it and continue
-		fModel.addError(e);
-		super.error(e);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.DocumentHandler#fatalError(org.xml.sax.SAXParseException)
-	 */
-	public void fatalError(SAXParseException e) throws SAXException {
-		//fatalError are not recoverable, so add it and refresh the marker as the document won't be parsed further
-		fModel.addError(e);
-		super.fatalError(e);
-		if (fModel.isMarkerRefreshNeeded()) {
-			TocMarkerManager.refreshMarkers(fModel);
-			fModel.setMarkerRefreshNeeded(false);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocLink.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocLink.java
deleted file mode 100644
index b9f73e7..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocLink.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-
-/**
- * The TocLink object represents a link to another TOC. Links in TOCs are much
- * like import or include directives, in the sense that they bring all the
- * contents of the linked TOC into the TOC that has this link.
- * 
- * TOC links cannot have any content within them, so they are leaf objects.
- */
-public class TocLink extends TocObject {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs a link with the given model and parent.
-	 * 
-	 * @param model
-	 *            The model associated with the new link.
-	 * @param parent
-	 *            The parent TocObject of the new link.
-	 */
-	public TocLink(TocModel model) {
-		super(model, ELEMENT_LINK);
-	}
-
-	/**
-	 * Constructs a link with the given model, parent and file.
-	 * 
-	 * @param model
-	 *            The model associated with the new link.
-	 * @param parent
-	 *            The parent TocObject of the new link.
-	 * @param file
-	 *            The TOC file to link to.
-	 */
-	public TocLink(TocModel model, IFile file) {
-		super(model, ELEMENT_LINK);
-
-		IPath path = file.getFullPath();
-		if (file.getProject().equals(
-				getSharedModel().getUnderlyingResource().getProject())) { // If
-																			// the
-																			// file
-																			// is
-																			// from
-																			// the
-																			// same
-																			// project,
-			// remove the project name segment
-			setFieldTocPath(path.removeFirstSegments(1).toString()); //$NON-NLS-1$
-		} else { // If the file is from another project, add ".."
-			// to traverse outside this model's project
-			setFieldTocPath(".." + path.toString()); //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.toc.TocObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#getType()
-	 */
-	public int getType() {
-		return TYPE_LINK;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#getName()
-	 */
-	public String getName() {
-		return getFieldTocPath();
-	}
-
-	public String getPath() {
-		return getFieldTocPath();
-	}
-
-	/**
-	 * @return the path associated with this TOC link
-	 */
-	public String getFieldTocPath() {
-		return getXMLAttributeValue(ATTRIBUTE_TOC);
-	}
-
-	/**
-	 * Change the value of the link path and signal a model change if needed.
-	 * 
-	 * @param id
-	 *            The new path to associate with the link
-	 */
-	public void setFieldTocPath(String path) {
-		setXMLAttribute(ATTRIBUTE_TOC, path);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocMarkerManager.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocMarkerManager.java
deleted file mode 100644
index c2e0549..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocMarkerManager.java
+++ /dev/null

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

- * Copyright (c) 2009 IBM Corporation and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

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

-

-package org.eclipse.pde.internal.ua.core.toc.text;

-

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

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

-import org.eclipse.pde.internal.core.PDECore;

-import org.xml.sax.SAXParseException;

-

-public class TocMarkerManager {

-

-	public static void refreshMarkers(TocModel model) {

-		deleteMarkers(model);

-		createMarkers(model);

-	}

-

-	public static void deleteMarkers(TocModel model) {

-		try {

-			IMarker[] problems = model.getUnderlyingResource().findMarkers(

-					IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);

-			if (problems != null) {

-				for (int index = 0; index < problems.length; index++) {

-					problems[index].delete();

-				}

-			}

-		} catch (CoreException e) {

-			PDECore.log(e);

-		}

-

-	}

-

-	public static void createMarkers(TocModel model) {

-		Collection errors = model.getErrors();

-		if (errors == null || errors.size() == 0) {

-			return;

-		}

-

-		Iterator iter = errors.iterator();

-		while (iter.hasNext()) {

-			Throwable exception = (Throwable) iter.next();

-			if (exception instanceof SAXParseException) {

-				int line = ((SAXParseException) exception).getLineNumber();

-				try {

-

-					IMarker marker = model.getUnderlyingResource()

-							.createMarker(IMarker.PROBLEM);

-

-					marker.setAttribute(IMarker.LINE_NUMBER, line);

-					marker.setAttribute(IMarker.SEVERITY,

-							IMarker.SEVERITY_ERROR);

-					marker.setAttribute(IMarker.MESSAGE, exception

-							.getLocalizedMessage());

-				} catch (CoreException e) {

-					PDECore.log(e);

-				}

-			}

-		}

-	}

-}


diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java
deleted file mode 100644
index 8c6e3a1..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocModel.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IWritable;
-import org.eclipse.pde.internal.core.NLResourceHelper;
-import org.eclipse.pde.internal.core.text.XMLEditingModel;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class TocModel extends XMLEditingModel {
-
-	private TocDocumentHandler fHandler;
-
-	private TocDocumentFactory fFactory;
-
-	private Toc fToc;
-
-	private List fErrors;
-
-	private boolean fMarkerRefreshNeeded;
-
-	/**
-	 * @param document
-	 * @param isReconciling
-	 */
-	public TocModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-
-		fHandler = null;
-		fFactory = new TocDocumentFactory(this);
-		fToc = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.core.text.XMLEditingModel#createDocumentHandler
-	 * (org.eclipse.pde.core.IModel, boolean)
-	 */
-	protected DefaultHandler createDocumentHandler(IModel model, boolean reconciling) {
-
-		if (fHandler == null) {
-			fHandler = new TocDocumentHandler(this, reconciling);
-		}
-		return fHandler;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.core.text.AbstractEditingModel#
-	 * createNLResourceHelper()
-	 */
-	protected NLResourceHelper createNLResourceHelper() {
-		// Not needed
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.icheatsheet.simple.ITocModel#getFactory()
-	 */
-	public TocDocumentFactory getFactory() {
-		return fFactory;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.icheatsheet.simple.ITocModel#getToc()
-	 */
-	public Toc getToc() {
-		if (fToc == null) {
-			fToc = getFactory().createToc();
-		}
-		return fToc;
-	}
-
-	protected IWritable getRoot() {
-		return getToc();
-	}
-
-	public TocDocumentHandler getDocumentHandler() {
-		return fHandler;
-	}
-
-	public void addError(Exception e) {
-		if (fErrors == null) {
-			fErrors = new ArrayList(1);
-		}
-
-		if (!fErrors.contains(e)) {
-			fErrors.add(e);
-		}
-	}
-
-	public Collection getErrors() {
-		return fErrors;
-	}
-
-	public void purgeErrors() {
-		if (fErrors != null) {
-			fErrors.clear();
-		}
-	}
-
-	public void setMarkerRefreshNeeded(boolean refresh) {
-		this.fMarkerRefreshNeeded = refresh;
-	}
-
-	public boolean isMarkerRefreshNeeded() {
-		return fMarkerRefreshNeeded;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocObject.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocObject.java
deleted file mode 100644
index 462c0d7..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocObject.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.core.text.DocumentObject;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
-
-/**
- * TocObject - All objects modeled in a Table of Contents subclass TocObject
- * This class contains functionality common to all TOC elements.
- */
-public abstract class TocObject extends DocumentObject implements
-		ITocConstants, Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs the TocObject and initializes its attributes.
-	 * 
-	 * @param model
-	 *            The model associated with this TocObject.
-	 * @param parent
-	 *            The parent of this TocObject.
-	 */
-	public TocObject(TocModel model, String tagName) {
-		super(model, tagName);
-	}
-
-	protected String getAttributeIndent() {
-		return " "; //$NON-NLS-1$
-	}
-
-	/**
-	 * @return the children of the object or an empty List if none exist.
-	 */
-	public List getChildren() { // Create a copy of the child list instead of
-		// returning the list itself. That way, our list
-		// of children cannot be altered from outside
-		ArrayList list = new ArrayList();
-
-		// Add children of this topic
-		IDocumentElementNode[] childNodes = getChildNodes();
-		if (childNodes.length > 0) {
-			for (int i = 0; i < childNodes.length; ++i) {
-				if (childNodes[i] instanceof TocObject) {
-					list.add(childNodes[i]);
-				}
-			}
-		}
-
-		return list;
-	}
-
-	public boolean isLeafNode() {
-		return !canBeParent();
-	}
-
-	/**
-	 * @return true iff this TOC object is capable of containing children.
-	 */
-	public abstract boolean canBeParent();
-
-	/**
-	 * @return the root TOC element that is an ancestor to this TocObject.
-	 */
-	public TocModel getModel() {
-		final IModel sharedModel = getSharedModel();
-		if (sharedModel instanceof TocModel) {
-			return (TocModel) sharedModel;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return the root TOC element that is an ancestor to this TocObject.
-	 */
-	public Toc getToc() {
-		final TocModel model = getModel();
-
-		if (model != null) {
-			return model.getToc();
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return the identifier for this TocObject.
-	 */
-	public abstract String getName();
-
-	/**
-	 * @return the path to the resource associated with this TOC object or
-	 *         <code>null</code> if one does not exist.
-	 */
-	public abstract String getPath();
-
-	/**
-	 * @return the parent of this TocObject, or <br />
-	 *         <code>null</code> if the TocObject has no parent.
-	 */
-	public TocObject getParent() {
-		IDocumentElementNode parent = getParentNode();
-		return parent instanceof TocObject ? (TocObject) parent : null;
-	}
-
-	/**
-	 * Check if the object is a direct or indirect descendant of the object
-	 * parameter.
-	 * 
-	 * @param obj
-	 *            The TOC object to find in this object's ancestry
-	 * @return true iff obj is an ancestor of this TOC object
-	 */
-	public boolean descendsFrom(TocObject obj) {
-		if (this.equals(obj)) {
-			return true;
-		}
-
-		if (getParent() != null && obj.canBeParent()) {
-			return getParent().descendsFrom(obj);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the concrete type of this TocObject.
-	 */
-	public abstract int getType();
-
-	/**
-	 * @param tocObject
-	 *            the child used to locate a sibling
-	 * @return the TocObject preceding the specified one in the list of children
-	 */
-	public TocObject getPreviousSibling(TocObject tocObject) {
-		return (TocObject) getPreviousSibling(tocObject, TocObject.class);
-	}
-
-	/**
-	 * @param tocObject
-	 *            the child used to locate a sibling
-	 * @return the TocObject proceeding the specified one in the list of
-	 *         children
-	 */
-	public TocObject getNextSibling(TocObject tocObject) {
-		return (TocObject) getNextSibling(tocObject, TocObject.class);
-	}
-
-	/**
-	 * @return true iff a child object can be removed
-	 */
-	public boolean canBeRemoved() {
-		if (getType() == TYPE_TOC) { // Semantic Rule: The TOC root element can
-										// never be removed
-			return false;
-		}
-
-		TocObject parent = getParent();
-		if (parent != null) {
-			if (parent.getType() == TYPE_TOC) { // Semantic Rule: The TOC root
-												// element must always
-				// have at least one child
-				return parent.getChildren().size() > 1;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocTopic.java b/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocTopic.java
deleted file mode 100644
index 2ba8949..0000000
--- a/ua/org.eclipse.pde.ua.core/src/org/eclipse/pde/internal/ua/core/toc/text/TocTopic.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.core.toc.text;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-
-/**
- * The TocTopic class represents a topic element in a TOC. A topic can link to a
- * specific Help page. It can also have children, which can be more topics.
- */
-public class TocTopic extends TocObject {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs a topic with the given model and parent.
-	 * 
-	 * @param model
-	 *            The model associated with the new topic.
-	 * @param parent
-	 *            The parent TocObject of the new topic.
-	 */
-	public TocTopic(TocModel model) {
-		super(model, ELEMENT_TOPIC);
-	}
-
-	/**
-	 * Constructs a subclass of a topic with the given model and parent.
-	 * 
-	 * @param model
-	 *            The model associated with the new topic.
-	 * @param parent
-	 *            The parent TocObject of the new topic.
-	 */
-	public TocTopic(TocModel model, String tagName) {
-		super(model, tagName);
-	}
-
-	/**
-	 * Constructs a topic with the given model, parent and file.
-	 * 
-	 * @param model
-	 *            The model associated with the new link.
-	 * @param parent
-	 *            The parent TocObject of the new link.
-	 * @param file
-	 *            The page to link to.
-	 */
-	public TocTopic(TocModel model, IFile file) {
-		super(model, ELEMENT_TOPIC);
-
-		IPath path = file.getFullPath();
-		if (file.getProject().equals(
-				getSharedModel().getUnderlyingResource().getProject())) { // If
-																			// the
-																			// file
-																			// is
-																			// from
-																			// the
-																			// same
-																			// project,
-			// remove the project name segment
-			setFieldRef(path.removeFirstSegments(1).toString()); //$NON-NLS-1$
-		} else { // If the file is from another project, add ".."
-			// to traverse outside this model's project
-			setFieldRef(".." + path.toString()); //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#canBeParent()
-	 */
-	public boolean canBeParent() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#getName()
-	 */
-	public String getName() {
-		return getFieldLabel();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.text.toc.TocObject#getPath()
-	 */
-	public String getPath() {
-		return getFieldRef();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ua.core.toc.TocObject#getType()
-	 */
-	public int getType() {
-		return TYPE_TOPIC;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.toc.TocObject#isFirstChildObject(org.eclipse
-	 * .pde.internal.ua.core.toc.TocObject)
-	 */
-	public boolean isFirstChildObject(TocObject tocObject) {
-		return super.isFirstChildNode(tocObject, TocObject.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.toc.TocObject#isLastChildObject(org.eclipse
-	 * .pde.internal.ua.core.toc.TocObject)
-	 */
-	public boolean isLastChildObject(TocObject tocObject) {
-		return super.isLastChildNode(tocObject, TocObject.class);
-	}
-
-	/**
-	 * Add a TocObject child to this topic and signal the model if necessary.
-	 * 
-	 * @param child
-	 *            The child to add to the TocObject
-	 */
-	public void addChild(TocObject child) {
-		addChildNode(child, true);
-	}
-
-	/**
-	 * Add a TocObject child to this topic beside a specified sibling and signal
-	 * the model if necessary.
-	 * 
-	 * @param child
-	 *            The child to add to the TocObject
-	 * @param sibling
-	 *            The object that will become the child's direct sibling
-	 * @param insertBefore
-	 *            If the object should be inserted before the sibling
-	 */
-	public void addChild(TocObject child, TocObject sibling,
-			boolean insertBefore) {
-		int currentIndex = indexOf(sibling);
-		if (!insertBefore) {
-			currentIndex++;
-		}
-
-		addChildNode(child, currentIndex, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ua.core.toc.TocObject#moveChild(org.eclipse.pde
-	 * .internal.core.toc.TocObject, int)
-	 */
-	public void moveChild(TocObject tocObject, int newRelativeIndex) {
-		moveChildNode(tocObject, newRelativeIndex, true);
-	}
-
-	/**
-	 * Remove a TocObject child from this topic and signal the model if
-	 * necessary.
-	 * 
-	 * @param child
-	 *            The child to add to the TocObject
-	 */
-	public void removeChild(TocObject tocObject) {
-		removeChildNode(tocObject, true);
-	}
-
-	/**
-	 * @return the label associated with this topic.
-	 */
-	public String getFieldLabel() {
-		return getXMLAttributeValue(ATTRIBUTE_LABEL);
-	}
-
-	/**
-	 * Change the value of the label field and signal a model change if needed.
-	 * 
-	 * @param name
-	 *            The new label for the topic
-	 */
-	public void setFieldLabel(String name) {
-		setXMLAttribute(ATTRIBUTE_LABEL, name);
-	}
-
-	/**
-	 * @return the link associated with this topic, <br />
-	 *         or <code>null</code> if none exists.
-	 */
-	public String getFieldRef() {
-		return getXMLAttributeValue(ATTRIBUTE_HREF);
-	}
-
-	/**
-	 * Change the value of the link field and signal a model change if needed.
-	 * 
-	 * @param value
-	 *            The new page location to be linked by this topic
-	 */
-	public void setFieldRef(String value) {
-		setXMLAttribute(ATTRIBUTE_HREF, value);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.tests/.classpath b/ua/org.eclipse.pde.ua.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/ua/org.eclipse.pde.ua.tests/.classpath
+++ /dev/null

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

diff --git a/ua/org.eclipse.pde.ua.tests/.cvsignore b/ua/org.eclipse.pde.ua.tests/.cvsignore
deleted file mode 100644
index 3aef9b8..0000000
--- a/ua/org.eclipse.pde.ua.tests/.cvsignore
+++ /dev/null

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

diff --git a/ua/org.eclipse.pde.ua.tests/.project b/ua/org.eclipse.pde.ua.tests/.project
deleted file mode 100644
index 92ff76c..0000000
--- a/ua/org.eclipse.pde.ua.tests/.project
+++ /dev/null

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

@@ -1,7 +0,0 @@
-#Wed May 14 16:23:28 CDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/ua/org.eclipse.pde.ua.tests/ALL UA Tests.launch b/ua/org.eclipse.pde.ua.tests/ALL UA Tests.launch
deleted file mode 100644
index 4d19a1a..0000000
--- a/ua/org.eclipse.pde.ua.tests/ALL UA Tests.launch
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/AllUATests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.pde.internal.ua.tests.AllUATests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.pde.ua.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>

diff --git a/ua/org.eclipse.pde.ua.tests/META-INF/MANIFEST.MF b/ua/org.eclipse.pde.ua.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index fcb677f..0000000
--- a/ua/org.eclipse.pde.ua.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde.ua.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.pde.internal.ua.tests.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.ua.core;bundle-version="[1.0.0,2.0.0)",
- org.junit;bundle-version="3.8.2",
- org.eclipse.text;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.pde.ua.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.6.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.pde.internal.ua.tests;x-internal:="true",
- org.eclipse.pde.internal.ua.tests.cheatsheet;x-internal:="true",
- org.eclipse.pde.internal.ua.tests.ctxhelp;x-internal:="true",
- org.eclipse.pde.internal.ua.tests.toc;x-internal:="true"
-Bundle-Localization: plugin

diff --git a/ua/org.eclipse.pde.ua.tests/about.html b/ua/org.eclipse.pde.ua.tests/about.html
deleted file mode 100644
index 4602330..0000000
--- a/ua/org.eclipse.pde.ua.tests/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ua/org.eclipse.pde.ua.tests/build.properties b/ua/org.eclipse.pde.ua.tests/build.properties
deleted file mode 100644
index cdd2db7..0000000
--- a/ua/org.eclipse.pde.ua.tests/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties
-src.includes = about.html

diff --git a/ua/org.eclipse.pde.ua.tests/plugin.properties b/ua/org.eclipse.pde.ua.tests/plugin.properties
deleted file mode 100644
index 468b85e..0000000
--- a/ua/org.eclipse.pde.ua.tests/plugin.properties
+++ /dev/null

@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.pde.ua.tests
-pluginName = PDE UA Tests (Incubation)
-providerName = Eclipse.org
\ No newline at end of file

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/Activator.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/Activator.java
deleted file mode 100644
index 9d8543d..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/Activator.java
+++ /dev/null

@@ -1,50 +0,0 @@
-package org.eclipse.pde.internal.ua.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.pde.ua.tests";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/AllUATests.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/AllUATests.java
deleted file mode 100644
index 26a4d35..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/AllUATests.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.pde.internal.ua.tests.cheatsheet.AllCheatSheetModelTests;
-import org.eclipse.pde.internal.ua.tests.ctxhelp.AllCtxHelpModelTests;
-import org.eclipse.pde.internal.ua.tests.toc.AllTocModelTests;
-
-public class AllUATests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for testing all ua related models"); //$NON-NLS-1$
-		suite.addTest(AllCheatSheetModelTests.suite());
-		suite.addTest(AllTocModelTests.suite());
-		suite.addTest(AllCtxHelpModelTests.suite());
-		return suite;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AbstractCheatSheetModelTestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AbstractCheatSheetModelTestCase.java
deleted file mode 100644
index d4f1632..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AbstractCheatSheetModelTestCase.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import junit.framework.TestCase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.pde.internal.core.text.IModelTextChangeListener;
-import org.eclipse.pde.internal.core.text.plugin.XMLTextChangeListener;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.text.SimpleCSModel;
-import org.eclipse.text.edits.*;
-
-public abstract class AbstractCheatSheetModelTestCase extends TestCase {
-
-	protected static final String LF = "\n"; //$NON-NLS-1$
-	protected static final String CR = "\r"; //$NON-NLS-1$
-	protected static final String CRLF = CR + LF;
-	
-	protected Document fDocument;
-	protected SimpleCSModel fModel;
-	protected IModelTextChangeListener fListener;
-
-	public AbstractCheatSheetModelTestCase() {
-	}
-
-	protected void setUp() throws Exception {
-		fDocument = new Document();
-	}
-
-	protected void load() {
-		load(false);
-	}
-
-	protected void load(boolean addListener) {
-		try {
-			fModel = new SimpleCSModel(fDocument, false);
-			fModel.load();
-			if (!fModel.isLoaded() || !fModel.isValid())
-				fail("model cannot be loaded");
-			if (addListener) {
-				fListener = new XMLTextChangeListener(fModel.getDocument());
-				fModel.addModelChangedListener(fListener);
-			}
-		} catch (CoreException e) {
-			fail("model cannot be loaded");
-		}
-	}
-	
-	protected void setXMLContents(StringBuffer body, String newline) {
-		StringBuffer sb = new StringBuffer();
-		sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		sb.append(newline);
-		sb.append("<cheatsheet title=\"sample cheatsheet\">");
-		sb.append(newline);
-		if (body != null)
-			sb.append(body.toString());
-		sb.append(newline);
-		sb.append("</cheatsheet>");
-		sb.append(newline);
-		fDocument.set(sb.toString());
-	}
-
-	protected void reload() {
-		TextEdit[] ops = fListener.getTextOperations();
-		if (ops.length == 0)
-			return;
-		MultiTextEdit multi = new MultiTextEdit();
-		multi.addChildren(ops);
-		try {
-			multi.apply(fDocument);
-		} catch (MalformedTreeException e) {
-			fail(e.getMessage());
-		} catch (BadLocationException e) {
-			fail(e.getMessage());
-		}
-		load();
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AllCheatSheetModelTests.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AllCheatSheetModelTests.java
deleted file mode 100644
index 93038bf..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/AllCheatSheetModelTests.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllCheatSheetModelTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for testing the cheatsheet model"); //$NON-NLS-1$
-		suite.addTestSuite(SimpleCSIntroTestCase.class);
-		suite.addTestSuite(SimpleCSItemTestCase.class);
-		suite.addTestSuite(SimpleCSSubItemTestCase.class);
-		suite.addTestSuite(SimpleCSItemAPITestCase.class);
-		suite.addTestSuite(SimpleCSSubItemAPITestCase.class);
-		suite.addTestSuite(SimpleCSSSpellCheckTestCase.class);
-		return suite;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/CheatSheetModelTestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/CheatSheetModelTestCase.java
deleted file mode 100644
index 046d81e..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/CheatSheetModelTestCase.java
+++ /dev/null

@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSAction;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSCommand;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConditionalSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSDescription;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSOnCompletion;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSPerformWhen;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRepeatedSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunContainerObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItemObject;
-
-/**
- * Provides helper methods to create and validate cheatsheet model elements.
- * Two sets of factory methods are provided: ones that generate valid cheatsheat 
- * XML tags and second that build cheatsheet model using API. Both generate the same data
- * that can be validated using validate* methods.
- *
- */
-public class CheatSheetModelTestCase extends AbstractCheatSheetModelTestCase {
-	
-	protected ISimpleCSAction createAction() {
-		ISimpleCSAction action = fModel.getFactory().createSimpleCSAction(null);
-		action.setClazz("org.eclipse.some.Clazz");
-		action.setPluginId("org.eclipse.pde.plugin.xyz");
-		action.setParam("param1.value", 1);
-		action.setParam("20", 2);
-		return action;
-	}
-	
-	protected ISimpleCSPerformWhen createPerformWhen() {
-		ISimpleCSPerformWhen performWhen = fModel.getFactory().createSimpleCSPerformWhen(null);
-		performWhen.setCondition("some.example.condition");
-		return performWhen;
-	}
-
-	protected ISimpleCSCommand createCommand() {
-		ISimpleCSCommand action = fModel.getFactory().createSimpleCSCommand(null);
-		action.setRequired(true);
-		action.setSerialization("org.eclipse.my.command");
-		return action;
-	}
-
-	protected ISimpleCSItem createComplexCSItem() {
-		ISimpleCSItem item = fModel.getFactory().createSimpleCSItem(null);
-		item.setSkip(true);
-		item.setTitle("Title");
-		item.setDialog(true);
-		
-		ISimpleCSDescription description = fModel.getFactory().createSimpleCSDescription(item);
-		description.setContent("Description1");
-		item.setDescription(description);
-		
-		ISimpleCSOnCompletion onCompletion = fModel.getFactory().createSimpleCSOnCompletion(item);
-		onCompletion.setContent("On.Completion.Contents");
-		item.setOnCompletion(onCompletion);
-		
-		return item;
-	}
-
-	protected ISimpleCSSubItemObject createConditionalSubitem() {
-		ISimpleCSConditionalSubItem subitem = fModel.getFactory().createSimpleCSConditionalSubItem(null);
-		subitem.setCondition("please.do");
-		return subitem;
-	}
-
-	protected StringBuffer createSimpleCSItem(ISimpleCSSubItemObject[] subitems) {
-		ISimpleCSItem item = fModel.getFactory().createSimpleCSItem(null);
-		item.setTitle("Title");
-		for (int i = 0; subitems != null && i < subitems.length; i++) {
-			item.addSubItem(subitems[i]);
-		}
-		
-		return new StringBuffer(item.toString());
-	}
-
-	protected ISimpleCSSubItem createSubItem() {
-		ISimpleCSSubItem subitem = fModel.getFactory().createSimpleCSSubItem(null);
-		subitem.setLabel("label1");
-		subitem.setSkip(true);
-		subitem.setWhen("always");
-		
-		return subitem;
-	}
-
-	protected ISimpleCSRepeatedSubItem createRepeatedSubItem() {
-		ISimpleCSRepeatedSubItem subitem = fModel.getFactory().createSimpleCSRepeatedSubItem(null);
-		subitem.setValues("repeat.value");
-		return subitem;
-	}
-	
-	protected StringBuffer createSimpleCSItem(String subitems, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<item title=\"Title\">").append(newline);
-		buffer.append(subitems);
-		buffer.append("</item>").append(newline);
-		return buffer;
-	}
-	
-	protected StringBuffer createComplexCSItem(String children, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<item").append(newline);
-		buffer.append(" skip=\"true\"").append(newline);
-		buffer.append(" title=\"Title\"").append(newline);
-		buffer.append(" dialog=\"true\"").append(newline);
-		buffer.append(">").append(newline);
-		buffer.append("<description>").append(newline);
-		buffer.append("Description1").append(newline);
-		buffer.append("</description>").append(newline);
-		buffer.append("<onCompletion>").append(newline);
-		buffer.append("On.Completion.Contents").append(newline);
-		buffer.append("</onCompletion>").append(newline);
-		buffer.append(children);
-		buffer.append("</item>").append(newline);
-		return buffer;
-	}
-	
-	protected String createAction(String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<action").append(newline);
-		buffer.append(" class=\"org.eclipse.some.Clazz\"").append(newline);
-		buffer.append(" pluginId=\"org.eclipse.pde.plugin.xyz\"").append(newline);
-		buffer.append(" param1=\"param1.value\"").append(newline);
-		buffer.append(" param2=\"20\"").append(newline);
-		buffer.append("/>").append(newline);
-		return buffer.toString();
-	}
-	
-	protected String createPerformWhen(String executables, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<perform-when").append(newline);
-		buffer.append(" condition=\"some.example.condition\"").append(newline);
-		buffer.append(">").append(newline);
-		buffer.append(executables).append(newline);
-		buffer.append("</perform-when>").append(newline);
-		return buffer.toString();
-	}
-	
-	protected String createCommand(String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<command").append(newline);
-		buffer.append("required=\"true\"").append(newline);
-		buffer.append("serialization=\"org.eclipse.my.command\"").append(newline);
-		buffer.append("/>").append(newline);
-		return buffer.toString();
-	}
-	
-	protected String createSubItem(String children, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<subitem").append(newline);
-		buffer.append(" label=\"label1\"").append(newline);
-		buffer.append(" skip=\"true\"").append(newline);
-		buffer.append(" when=\"always\"").append(newline);
-		buffer.append(">").append(newline);
-		buffer.append(children);
-		buffer.append("</subitem>").append(newline);
-		return buffer.toString();
-	}
-	
-	protected String createRepeatedSubItem(String children, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<repeated-subitem").append(newline);
-		buffer.append(" values=\"repeat.value\"").append(newline);
-		buffer.append(">").append(newline);
-		buffer.append(children);
-		buffer.append("</repeated-subitem>").append(newline);
-		return buffer.toString();
-	}
-	
-	protected String createConditionalSubItem(String children, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<conditional-subitem").append(newline);
-		buffer.append(" condition=\"please.do\"").append(newline);
-		buffer.append(">").append(newline);
-		buffer.append(children);
-		buffer.append("</conditional-subitem>").append(newline);
-		return buffer.toString();
-	}
-	
-	protected void validateComplexCSItem(ISimpleCSItem item) {
-		assertTrue(item.getDialog());
-		assertTrue(item.getSkip());
-		assertEquals("Title", item.getTitle());
-		
-		ISimpleCSDescription description = item.getDescription();
-		assertNotNull(description);
-		assertEquals(ISimpleCS.TYPE_DESCRIPTION, description.getType());
-		assertEquals(description.getContent(), description.getName());
-		assertEquals("Description1", description.getContent());
-		
-		ISimpleCSOnCompletion onCompletion = item.getOnCompletion();
-		assertNotNull(onCompletion);
-		assertEquals(ISimpleCS.TYPE_ON_COMPLETION, onCompletion.getType());
-		assertEquals(ISimpleCS.ELEMENT_ONCOMPLETION, onCompletion.getName());
-		assertEquals("On.Completion.Contents", onCompletion.getContent());
-	}
-	
-	protected void validateSubItem(ISimpleCSSubItemObject subitem) {
-		assertTrue(subitem instanceof ISimpleCSSubItem);
-		assertEquals(ISimpleCSConstants.TYPE_SUBITEM, subitem.getType());
-		ISimpleCSSubItem simpleSubitem = (ISimpleCSSubItem) subitem;
-		assertEquals("label1", simpleSubitem.getLabel());
-		assertEquals("label1", simpleSubitem.getName());
-		assertTrue(simpleSubitem.getSkip());
-		assertEquals("always", simpleSubitem.getWhen());
-	}
-	
-	protected void validateRepeatedSubItem(ISimpleCSSubItemObject subitem) {
-		assertTrue(subitem instanceof ISimpleCSRepeatedSubItem);
-		assertEquals(ISimpleCSConstants.TYPE_REPEATED_SUBITEM, subitem.getType());
-		assertEquals("repeat.value", ((ISimpleCSRepeatedSubItem) subitem).getValues());
-	}
-	
-	protected void validateConditionalSubItem(ISimpleCSSubItemObject subitem) {
-		assertTrue(subitem instanceof ISimpleCSConditionalSubItem);
-		assertEquals(ISimpleCSConstants.TYPE_CONDITIONAL_SUBITEM, subitem.getType());
-		assertEquals("please.do", ((ISimpleCSConditionalSubItem) subitem).getCondition());
-	}
-	
-	protected void validateSubItemsCount(int expected, ISimpleCSItem item) {
-		assertTrue(item.hasSubItems());
-		assertEquals(expected, item.getSubItemCount());
-		ISimpleCSSubItemObject[] subitems = item.getSubItems();
-		assertNotNull(subitems);
-		assertEquals(expected, subitems.length);
-	}
-	
-	protected void validateItemsCount(int expected, ISimpleCS model) {
-		assertTrue(model.hasItems());
-		assertEquals(expected, model.getItemCount());
-		ISimpleCSItem[] items = model.getItems();
-		assertEquals(expected, items.length);
-	}
-	
-	protected void validateAction(ISimpleCSRunContainerObject executable) {
-		assertNotNull(executable);
-		assertTrue(executable instanceof ISimpleCSAction);
-		ISimpleCSAction action = (ISimpleCSAction) executable;
-		
-		String[] params = action.getParams();
-		assertNotNull(params);
-		assertEquals(2, params.length);
-		assertEquals("param1.value", params[0]);
-		assertEquals("20", params[1]);
-		
-		assertEquals("org.eclipse.some.Clazz", action.getClazz());
-		assertEquals("org.eclipse.pde.plugin.xyz", action.getPluginId());
-		assertEquals(null, action.getParam(0)); // params are indexed starting with 1
-		assertEquals("param1.value", action.getParam(1));
-		assertEquals("20", action.getParam(2));
-		assertEquals(null, action.getParam(3));
-	}
-	
-	protected void validateCommand(ISimpleCSRunContainerObject executable) {
-		assertNotNull(executable);
-		assertTrue(executable instanceof ISimpleCSCommand);
-		ISimpleCSCommand command = (ISimpleCSCommand) executable;
-		
-		assertTrue(command.getRequired());
-		assertEquals("org.eclipse.my.command", command.getSerialization());
-	}
-	
-	protected void validatePerformWhen(ISimpleCSRunContainerObject executable) {
-		assertNotNull(executable);
-		assertTrue(executable instanceof ISimpleCSPerformWhen);
-		ISimpleCSPerformWhen performWhen = (ISimpleCSPerformWhen) executable;
-		
-		assertEquals("some.example.condition", performWhen.getCondition());
-	}
-	
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSIntroTestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSIntroTestCase.java
deleted file mode 100644
index 8e82b0a..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSIntroTestCase.java
+++ /dev/null

@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSDescription;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSIntro;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-
-/**
- * Basic tests.
- */
-public class SimpleCSIntroTestCase extends AbstractCheatSheetModelTestCase {
-
-	protected static String INTRO_HREF = "/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm"; //$NON-NLS-1$
-	protected static String DESCRIPTION = "some description"; //$NON-NLS-1$
-	
-	public void testReadSimpleCSIntro() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<intro href=\"").append(INTRO_HREF).append("\">");
-		buffer.append(LF);
-		buffer.append("<description>");
-		buffer.append(DESCRIPTION);
-		buffer.append("</description>");
-		buffer.append(LF);
-		buffer.append("</intro>");
-		setXMLContents(buffer, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		String title = model.getTitle();
-		assertEquals("Incorrect title", "sample cheatsheet", title);
-		assertEquals(title, model.getName());
-		assertEquals(ISimpleCS.TYPE_CHEAT_SHEET, model.getType());
-		assertTrue(model.isRoot());
-		
-		// check intro
-		ISimpleCSIntro intro = model.getIntro();
-		assertNotNull(intro);
-		assertEquals(intro.getHref(), INTRO_HREF);
-		assertNull(intro.getContextId());
-		assertEquals(ISimpleCS.TYPE_INTRO, intro.getType());
-		
-		// check description
-		ISimpleCSDescription description = intro.getDescription();
-		assertNotNull(description);
-		assertEquals(DESCRIPTION, description.getContent());
-		assertEquals(ISimpleCS.TYPE_DESCRIPTION, description.getType());
-	}
-	
-	public void testSetModelAttributes() {
-		setXMLContents(null, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		model.setTitle("Some Title");
-		assertEquals("Some Title", model.getTitle());
-		
-		model.setTitle(null);
-		assertEquals("", model.getTitle());
-		
-		ISimpleCSIntro intro = fModel.getFactory().createSimpleCSIntro(model);
-		model.setIntro(intro);
-		assertEquals(intro, model.getIntro());
-	}
-	
-	public void testSetIntroDescription() {
-		setXMLContents(null, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		ISimpleCSIntro intro = fModel.getFactory().createSimpleCSIntro(model);
-		model.setIntro(intro);
-		
-		ISimpleCSDescription description = fModel.getFactory().createSimpleCSDescription(intro);
-		description.setContent("description content");
-		intro.setDescription(description);
-		
-		assertEquals("description content", model.getIntro().getDescription().getContent());
-	}
-	
-	public void testAddSimpleCSItem() {
-		setXMLContents(null, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		assertEquals(0, model.getItemCount());
-		assertNotNull(model.getItems());
-		assertFalse(model.hasItems());
-		
-		ISimpleCSItem item = fModel.getFactory().createSimpleCSItem(model);
-		item.setTitle("some title"); //$NON-NLS-1$
-		
-		assertEquals(-1, model.indexOfItem(item));
-		assertFalse(model.isFirstItem(item));
-		assertFalse(model.isLastItem(item));
-		
-		model.addItem(item);
-		
-		assertEquals(1, model.getItemCount());
-		assertNotNull(model.getItems());
-		assertEquals(1, model.getItems().length);
-		assertTrue(model.hasItems());
-		
-		item = model.getItems()[0];
-		
-		assertEquals("some title", item.getTitle());
-		assertTrue(model.isFirstItem(item));
-		assertTrue(model.isLastItem(item));
-		assertEquals(0, model.indexOfItem(item));
-	}
-	
-	public void testAddSimpleCSItem2() {
-		setXMLContents(null, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		ISimpleCSItem itemA = fModel.getFactory().createSimpleCSItem(model);
-		itemA.setTitle("title A"); //$NON-NLS-1$
-		ISimpleCSItem itemB = fModel.getFactory().createSimpleCSItem(model);
-		itemB.setTitle("title B"); //$NON-NLS-1$
-		
-		model.addItem(0, itemA);
-		model.addItem(0, itemB);
-		
-		assertTrue(model.isFirstItem(itemB));
-		assertTrue(model.isLastItem(itemA));
-	}
-	
-	public void testRemoveSimpleCSItem() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<intro></intro>");
-		buffer.append("<item title=\"item1\"></item>");
-		setXMLContents(buffer, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		assertEquals(1, model.getItemCount());
-		model.removeItem(1);
-		
-		assertEquals(0, model.getItemCount());
-	}
-	
-	public void testRemoveSimpleCSItem2() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<intro></intro>");
-		buffer.append("<item title=\"item1\"></item>");
-		buffer.append("<item title=\"item2\"></item>");
-		setXMLContents(buffer, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		assertEquals(2, model.getItemCount());
-		ISimpleCSItem item = model.getItems()[0];
-		assertEquals("item1", item.getTitle());
-		model.removeItem(item);
-		
-		assertEquals(1, model.getItemCount());
-		item = model.getItems()[0];
-		assertNotNull(item);
-		assertEquals("item2", item.getTitle());
-		assertEquals(1, model.indexOfItem(model.getItems()[0]));
-	}
-	
-	public void testMoveSimpleCSItem() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<intro></intro>");
-		buffer.append("<item title=\"item1\"></item>");
-		buffer.append("<item title=\"item2\"></item>");
-		setXMLContents(buffer, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		ISimpleCSItem item1 = model.getItems()[0];
-		ISimpleCSItem item2 = model.getItems()[1];
-		
-		assertEquals(0, model.indexOf(model.getIntro()));
-		assertEquals(1, model.indexOfItem(item1));
-		assertEquals(2, model.indexOfItem(item2));
-		assertEquals(item2, model.getNextSibling(item1));
-		assertEquals(item1, model.getPreviousSibling(item2));
-		
-		model.moveItem(item1, 0); // = don't move
-		
-		assertEquals(1, model.indexOfItem(item1));
-		assertEquals(2, model.indexOfItem(item2));
-		assertEquals(item2, model.getNextSibling(item1));
-		assertEquals(item1, model.getPreviousSibling(item2));
-		
-		model.moveItem(item1, +1);
-		
-		assertEquals(2, model.indexOfItem(item1));
-		assertEquals(1, model.indexOfItem(item2));
-		assertEquals(item1, model.getNextSibling(item2));
-		assertEquals(item2, model.getPreviousSibling(item1));
-		
-		model.moveItem(item2, -1);
-		
-		assertEquals(2, model.indexOfItem(item1));
-		assertEquals(0, model.indexOfItem(item2));
-		
-		model.moveItem(item2, -1); // effectively no move, because item2 is already at index 0
-		
-		assertEquals(2, model.indexOfItem(item1));
-		assertEquals(0, model.indexOfItem(item2));
-	}
-	
-	//bug 285134
-	public void testSingleQuoteAttributes() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<intro></intro>");
-		buffer.append("<item ");
-		buffer.append(LF);
-		buffer.append("title='Item'>");
-		buffer.append("<description>");
-		buffer.append(DESCRIPTION);
-		buffer.append("</description>");
-		buffer.append(LF);
-		buffer.append("</item>");
-		setXMLContents(buffer, LF);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		ISimpleCSItem item = model.getItems()[0];
-		assertEquals(item.getTitle(), "Item");
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemAPITestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemAPITestCase.java
deleted file mode 100644
index 5cd0f48..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemAPITestCase.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-
-/**
- * Cheatsheet items tests for API-generated models.
- */
-public class SimpleCSItemAPITestCase extends CheatSheetModelTestCase {
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		setXMLContents(new StringBuffer(), LF);
-		load();
-	}
-
-	public void testSimpleCSItemTestCase() {
-		simpleCSItemTestCase("");
-	}
-	
-	public void testSimpleCSItemTestCaseSpace() {
-		simpleCSItemTestCase(" ");
-	}
-	
-	public void testSimpleCSItemTestCaseCR() {
-		simpleCSItemTestCase(CR);
-	}
-	
-	public void testSimpleCSItemTestCaseLF() {
-		simpleCSItemTestCase(LF);
-	}
-	
-	public void testSimpleCSItemTestCaseCRLF() {
-		simpleCSItemTestCase(CRLF);
-	}
-	
-	public void simpleCSItemTestCase(String newline) {
-		ISimpleCSItem item = createComplexCSItem();
-
-		ISimpleCS model = process(item.toString(), newline);
-		
-		validateItemsCount(1, model);
-		item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-	}
-	
-	public void testItemActionTestCase() {
-		ISimpleCSItem item = createComplexCSItem();
-		item.setExecutable(createAction());
-
-		ISimpleCS model = process(item.toString(), LF);
-		
-		validateItemsCount(1, model);
-		item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-		validateAction(item.getExecutable());
-	}
-	
-	public void testItemCommandTestCase() {
-		ISimpleCSItem item = createComplexCSItem();
-		item.setExecutable(createCommand());
-		
-		ISimpleCS model = process(item.toString(), LF);
-		
-		validateItemsCount(1, model);
-		item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-		validateCommand(item.getExecutable());
-	}
-	
-	public void testItemPerformWhenTestCase() {
-		ISimpleCSItem item = createComplexCSItem();
-		item.setExecutable(createPerformWhen());
-		
-		ISimpleCS model = process(item.toString(), LF);
-		
-		validateItemsCount(1, model);
-		item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-		validatePerformWhen(item.getExecutable());
-	}
-	
-	public ISimpleCS process(String buffer, String newline) {
-		setXMLContents(new StringBuffer(buffer), newline);
-		load();
-		
-		return fModel.getSimpleCS();
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemTestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemTestCase.java
deleted file mode 100644
index d9ae52e..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSItemTestCase.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-
-/**
- * Cheatsheet items tests for XML-generated models.
- */
-public class SimpleCSItemTestCase extends CheatSheetModelTestCase  {
-		
-	public void testSimpleCSItemTestCase() {
-		simpleCSItemTestCase("");
-	}
-	
-	public void testSimpleCSItemTestCaseSpace() {
-		simpleCSItemTestCase(" ");
-	}
-	
-	public void testSimpleCSItemTestCaseCR() {
-		simpleCSItemTestCase(CR);
-	}
-	
-	public void testSimpleCSItemTestCaseLF() {
-		simpleCSItemTestCase(LF);
-	}
-	
-	public void testSimpleCSItemTestCaseCRLF() {
-		simpleCSItemTestCase(CRLF);
-	}
-	
-	public void simpleCSItemTestCase(String newline) {
-		StringBuffer buffer = createComplexCSItem("", newline);
-
-		ISimpleCS model = process(buffer, newline);
-		
-		validateItemsCount(1, model);
-		ISimpleCSItem item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-	}
-	
-	public void testItemActionTestCase() {
-		String action = createAction(LF);
-		StringBuffer buffer = createComplexCSItem(action, LF);
-
-		ISimpleCS model = process(buffer, LF);
-		
-		validateItemsCount(1, model);
-		ISimpleCSItem item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-		validateAction(item.getExecutable());
-	}
-	
-	public void testItemCommandTestCase() {
-		String command = createCommand(LF);
-		StringBuffer buffer = createComplexCSItem(command, LF);
-		
-		ISimpleCS model = process(buffer, LF);
-		
-		validateItemsCount(1, model);
-		ISimpleCSItem item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-		validateCommand(item.getExecutable());
-	}
-	
-	public void testItemPerformWhenTestCase() {
-		String command = createPerformWhen("", LF);
-		StringBuffer buffer = createComplexCSItem(command, LF);
-		
-		ISimpleCS model = process(buffer, LF);
-		
-		validateItemsCount(1, model);
-		ISimpleCSItem item = model.getItems()[0];
-		
-		validateComplexCSItem(item);
-		validatePerformWhen(item.getExecutable());
-	}
-	
-	public ISimpleCS process(StringBuffer buffer, String newline) {
-		setXMLContents(buffer, newline);
-		load();
-		
-		return fModel.getSimpleCS();
-	}
-	
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSSpellCheckTestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSSpellCheckTestCase.java
deleted file mode 100644
index feb3b20..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSSpellCheckTestCase.java
+++ /dev/null

@@ -1,428 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Iterator;
-
-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.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSEditor;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSSourcePage;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.spelling.SpellingAnnotation;
-
-/**
- * Tests the spelling annotations in a Simple Cheat sheet editor.
- *
- */
-public class SimpleCSSSpellCheckTestCase extends AbstractCheatSheetModelTestCase {
-
-	private IEditorPart fEditor;
-	private IProject fProject;
-	private static final String EDITOR_ID = "org.eclipse.pde.ua.ui.simpleCheatSheetEditor";
-
-	protected void setUp() throws Exception {
-
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		fProject = root.getProject("ua.tests.cs");
-		if (fProject.exists()) {
-			fProject.delete(true, true, null);
-		}
-		fProject.create(null);
-		fProject.open(null);
-	}
-
-	/**
-	 * Testing for the spelling error annotation being present at the right location 
-	 * in a string with double quotes
-	 */
-	public void testSpellingErrorInDoubleQuotedStringTestCase() {
-		StringBuffer csText = new StringBuffer();
-		
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Bodi\"</b>"); //The spelling error shall appear here
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText,"<item");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 97, 2, 1);
-	}
-
-	/**
-	 * Testing for the spelling error annotation being present at the right location 
-	 * in a string with single quotes
-	 */
-	public void testSpellingErrorInSingleQuotedStringTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>'Bodi'</b>"); //The spelling error shall appear here
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText,"<item");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 97, 2, 1);
-
-	}
-
-	/**
-	 * Testing for the spelling error annotation being present at the right location 
-	 * in a double quoted string containing single quotes
-	 */
-	public void testSpellingErrorInDoubleQuotedStringWithSingleQuotesTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"'single quoted string' Bodi\"</b>"); //The spelling error shall appear here
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText,"<item");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 120, 2, 1);
-
-	}
-	
-	/**
-	 * Testing for the spelling error annotation being present at the right location 
-	 * in a single quoted string containing double quotes
-	 */
-	public void testSpellingErrorInDoubleQuotedStringWithDoubleQuotesTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>'Bodi\" is not a correct spelling\"'</b>"); //The spelling error shall appear here
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText,"<item");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 97, 2, 1);
-
-	}
-	private void validateAnnotations(String contents, int position, int totalAnnotationCount, int spellingAnnotationCount) {
-
-		try {
-			createAndOpenFile("SimpleCS.xml", contents);
-		} catch (CoreException e) {
-			fail(e.getMessage());
-			e.printStackTrace();
-		} catch (IOException e) {
-			fail(e.getMessage());
-		}
-
-		SimpleCSEditor editor = (SimpleCSEditor) fEditor;
-		SimpleCSSourcePage simpleCSSrcPage = (SimpleCSSourcePage) editor.getActivePageInstance();
-		ISourceViewer sourceViewer = simpleCSSrcPage.getViewer();
-
-		IAnnotationModel model = sourceViewer.getAnnotationModel();
-		Iterator iter = model.getAnnotationIterator();
-		int actualTotalAnnotationCount = 0;
-		int actualSpellingAnnotationCount = 0;
-		while (iter.hasNext()) {
-			actualTotalAnnotationCount++;
-			Annotation annotation = (Annotation) iter.next();
-			if (annotation instanceof SpellingAnnotation) {
-				actualSpellingAnnotationCount++;
-				if (position != 0) {
-					int offset = ((SpellingAnnotation) annotation).getSpellingProblem().getOffset();
-					assertEquals(position, offset);
-				}
-			}
-		}
-		assertEquals(totalAnnotationCount, actualTotalAnnotationCount);
-		assertEquals(spellingAnnotationCount, actualSpellingAnnotationCount);
-
-		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		page.closeAllEditors(false);
-	}
-
-	/**
-	 * The spelling error annotation should not appear for spelling errors in an XML tag
-	 */
-	public void testNoSpellingAnnotationForXMLTag() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Body\"</b>");
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText,"<item");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 0, 1, 0);
-	}
-	
-	/**
-	 * Testing for the multiple spelling error annotations
-	 */
-	public void testMultipleSpellingErrorsTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Tital\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Bodi\"</b>");
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText,"<item");
-		append(csText,"title=\"Itim\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 0, 4, 3);
-	}
-
-	/**
-	 * Testing for the zero spelling error annotations
-	 */
-	public void testZeroSpellingErrorsTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Body\"</b>");
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText,"<item");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 0, 1, 0);
-	}
-	
-	/**
-	 * The spelling errors in the XML comments should be ignored 
-	 */
-	public void testSpellingErrorsInXMLCommentTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Body\"</b>");
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText, "<!-- Itm One -->");
-		append(csText,"<item ");
-		append(csText,"href=\"/org.eclipse.pde/about.html\" ");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 0, 1, 0);
-	}
-	
-	/**
-	 * The spelling errors in the multiple line XML comments should be ignored 
-	 */
-	public void testSpellingErrorsInMultiLineXMLCommentTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Body\"</b>");
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText, "<!-- Itm One ");
-		append(csText, " commnt with spell error continues");
-		append(csText, " comment ends --->");
-		append(csText,"<item ");
-		append(csText,"href=\"/org.eclipse.pde/about.html\" ");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 0, 1, 0);
-	}
-	
-	/**
-	 * Testing for no unwanted spelling annotations due to single quote in XML comment
-	 */
-	public void testSingleQuoteInXMLCommentTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Body\"</b>");
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText, "<!-- Item's One -->"); // single quote in XML Comment
-		append(csText,"<item ");
-		append(csText,"href=\"/org.eclipse.pde/about.html\" ");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 0, 1, 0);
-	}
-	
-	/**
-	 * Testing for no unwanted spelling annotations due to double quote in XML comment
-	 */
-	public void testDoubleQuoteInXMLCommentTestCase() {
-		StringBuffer csText = new StringBuffer();
-
-		append(csText,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		append(csText,"<cheatsheet");
-		append(csText,"title=\"Title\">");
-		append(csText,"<intro>");
-		append(csText,"<description>");
-		append(csText,"<b>\"Body\"</b>");
-		append(csText,"</description>");
-		append(csText,"</intro>");
-		append(csText, "<!-- Item\"s One -->"); // double quote in XML Comment
-		append(csText,"<item ");
-		append(csText,"href=\"/org.eclipse.pde/about.html\" ");
-		append(csText,"title=\"Item\">");
-		append(csText,"<description>");
-		append(csText,"<b>Body</b>");
-		append(csText,"</description>");
-		append(csText,"</item>");
-		append(csText,"</cheatsheet>");
-
-		validateAnnotations(csText.toString(), 0, 1, 0);
-	}
-	
-	private void createAndOpenFile(String fileName, String fileContents) throws CoreException, IOException {
-		IPath path = fProject.getLocation();
-		path = path.append(fileName);
-		IFile projectFile = fProject.getFile(fileName);
-		File file = path.toFile();
-		if (projectFile.exists()) {
-			projectFile.delete(true, null);
-		}
-		file.createNewFile();
-		projectFile.create(new FileInputStream(file), true, null);
-
-		FileOutputStream fos = new FileOutputStream(file);
-		OutputStreamWriter osw = new OutputStreamWriter(fos);
-		BufferedWriter bw = new BufferedWriter(osw);
-		bw.write(fileContents);
-		bw.flush();
-		bw.close();
-
-		projectFile.refreshLocal(IResource.DEPTH_INFINITE, null);
-		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		fEditor = IDE.openEditor(page, projectFile, EDITOR_ID, true);
-
-		try {
-			Thread.sleep(5000);
-		} catch (InterruptedException e) {
-		}
-
-		SimpleCSEditor editor = (SimpleCSEditor) fEditor;
-		PDESourcePage pdeSrcPage = (PDESourcePage) editor.setActivePage(SimpleCSInputContext.CONTEXT_ID);
-		IDocumentProvider dp = pdeSrcPage.getDocumentProvider();
-		fDocument = (Document) dp.getDocument(fEditor.getEditorInput());
-	}
-	
-	private void append(StringBuffer buffer, String text){
-		buffer.append(text + CRLF);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemAPITestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemAPITestCase.java
deleted file mode 100644
index 553dd2e..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemAPITestCase.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItemObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.text.SimpleCSSubItem;
-
-/**
- * Cheatsheet subitems tests for API-generated models.
-
- */
-public class SimpleCSSubItemAPITestCase extends CheatSheetModelTestCase {
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		setXMLContents(new StringBuffer(), LF);
-		load();
-	}
-	
-	public void testSimpleSubItemTestCase() {
-		simpleSubItemTestCase(1, LF);
-	}
-	
-	public void testSimpleSubItemCommandTestCase() {
-		simpleSubItemCommandTestCase(1, LF);
-	}
-	
-	public void testSimpleSubItemActionTestCase() {
-		simpleSubItemActionTestCase(1, LF);
-	}
-	
-	public void testSimpleRepeatedSubItemTestCase() {
-		simpleRepeatedSubItemTestCase(1, LF);
-	}
-	
-	public void testSimpleConditionalSubItemTestCase() {
-		simpleConditionalSubItemTestCase(1, LF);
-	}
-	
-	public void testSimpleSubItemTestCase3() {
-		simpleSubItemTestCase(3, LF);
-	}
-	
-	public void testSimpleSubItemCommandTestCase3() {
-		simpleSubItemCommandTestCase(3, LF);
-	}
-	
-	public void testSimpleSubItemActionTestCase3() {
-		simpleSubItemActionTestCase(3, LF);
-	}
-	
-	public void testSimpleRepeatedSubItemTestCase3() {
-		simpleRepeatedSubItemTestCase(3, LF);
-	}
-	
-	public void testSimpleConditionalSubItemTestCase3() {
-		simpleConditionalSubItemTestCase(3, LF);
-	}
-	
-	public void simpleSubItemTestCase(int subitemsCount, String newline) {
-		ISimpleCSSubItem[] subitems = new ISimpleCSSubItem[subitemsCount];
-		
-		for (int i =0; i < subitemsCount; i++) {
-			subitems[i] = createSubItem();
-			subitems[i].setExecutable(createCommand());
-		}
-		
-		ISimpleCSItem item = process(subitems, newline);
-		
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			ISimpleCSSubItemObject subitem = item.getSubItems()[i];
-			validateSubItem(subitem);
-		}
-	}
-	
-	public void simpleSubItemCommandTestCase(int subitemsCount, String newline) {
-		ISimpleCSSubItem[] subitems = new ISimpleCSSubItem[subitemsCount];
-		
-		for (int i =0; i < subitemsCount; i++) {
-			subitems[i] = createSubItem();
-			subitems[i].setExecutable(createCommand());
-		}
-		
-		ISimpleCSItem item = process(subitems, newline);
-		
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			ISimpleCSSubItemObject subitem = item.getSubItems()[i];
-			validateSubItem(subitem);
-			
-			SimpleCSSubItem simpleSubitem = (SimpleCSSubItem) subitem;
-			validateCommand(simpleSubitem.getExecutable());
-		}
-	}
-	
-	public void simpleSubItemActionTestCase(int subitemsCount, String newline) {
-		ISimpleCSSubItem[] subitems = new ISimpleCSSubItem[subitemsCount];
-		
-		for (int i =0; i < subitemsCount; i++) {
-			subitems[i] = createSubItem();
-			subitems[i].setExecutable(createAction());
-		}
-		
-		ISimpleCSItem item = process(subitems, newline);
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			ISimpleCSSubItemObject subitem = item.getSubItems()[i];
-			validateSubItem(subitem);
-			
-			SimpleCSSubItem simpleSubitem = (SimpleCSSubItem) subitem;
-			validateAction(simpleSubitem.getExecutable());
-		}
-	}
-	
-	public void simpleRepeatedSubItemTestCase(int subitemsCount, String newline) {
-		ISimpleCSSubItemObject[] subitems = new ISimpleCSSubItemObject[subitemsCount];
-		
-		for (int i =0; i < subitemsCount; i++) {
-			subitems[i] = createRepeatedSubItem();
-		}
-		
-		ISimpleCSItem item = process(subitems, newline);
-		
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			validateRepeatedSubItem(item.getSubItems()[i]);
-		}
-	}
-	
-	public void simpleConditionalSubItemTestCase(int subitemsCount, String newline) {
-		ISimpleCSSubItemObject[] subitems = new ISimpleCSSubItemObject[subitemsCount];
-		
-		for (int i =0; i < subitemsCount; i++) {
-			subitems[i] = createConditionalSubitem();
-		}
-		
-		ISimpleCSItem item = process(subitems, newline);
-				
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			validateConditionalSubItem(item.getSubItems()[i]);
-		}
-	}
-	
-	public ISimpleCSItem process(ISimpleCSSubItemObject[] subitems, String newline) {
-		StringBuffer buffer = createSimpleCSItem(subitems);
-		
-		setXMLContents(buffer, newline);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		validateItemsCount(1, model);
-		
-		return model.getItems()[0];
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemTestCase.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemTestCase.java
deleted file mode 100644
index 0b88c93..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/cheatsheet/SimpleCSSubItemTestCase.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItemObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.text.SimpleCSSubItem;
-
-/**
- * Cheatsheet subitems tests for XML-generated models.
- */
-public class SimpleCSSubItemTestCase extends CheatSheetModelTestCase  {
-	
-	public void testSimpleSubItemTestCase() {
-		simpleSubItemTestCase(1, LF);
-	}
-	
-	public void testSimpleSubItemCommandTestCase() {
-		simpleSubItemCommandTestCase(1, LF);
-	}
-	
-	public void testSimpleSubItemActionTestCase() {
-		simpleSubItemActionTestCase(1, LF);
-	}
-	
-	public void testSimpleRepeatedSubItemTestCase() {
-		simpleRepeatedSubItemTestCase(1, LF);
-	}
-	
-	public void testSimpleConditionalSubItemTestCase() {
-		simpleConditionalSubItemTestCase(1, LF);
-	}
-	
-	public void testSimpleSubItemTestCase3() {
-		simpleSubItemTestCase(3, LF);
-	}
-	
-	public void testSimpleSubItemCommandTestCase3() {
-		simpleSubItemCommandTestCase(3, LF);
-	}
-	
-	public void testSimpleSubItemActionTestCase3() {
-		simpleSubItemActionTestCase(3, LF);
-	}
-	
-	public void testSimpleRepeatedSubItemTestCase3() {
-		simpleRepeatedSubItemTestCase(3, LF);
-	}
-	
-	public void testSimpleConditionalSubItemTestCase3() {
-		simpleConditionalSubItemTestCase(3, LF);
-	}
-	
-	public void simpleSubItemTestCase(int subitemsCount, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		
-		for (int i =0; i < subitemsCount; i++) {
-			String action = createAction(newline);
-			buffer.append(createSubItem(action, newline));
-		}
-		
-		ISimpleCSItem item = process(buffer.toString(), newline);
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			ISimpleCSSubItemObject subitem = item.getSubItems()[i];
-			validateSubItem(subitem);
-		}
-	}
-	
-	public void simpleSubItemCommandTestCase(int subitemsCount, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		
-		for (int i =0; i < subitemsCount; i++) {
-			String action = createCommand(newline);
-			buffer.append(createSubItem(action, newline));
-		}
-		
-		ISimpleCSItem item = process(buffer.toString(), newline);
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			ISimpleCSSubItemObject subitem = item.getSubItems()[i];
-			validateSubItem(subitem);
-			
-			SimpleCSSubItem simpleSubitem = (SimpleCSSubItem) subitem;
-			validateCommand(simpleSubitem.getExecutable());
-		}
-	}
-	
-	public void simpleSubItemActionTestCase(int subitemsCount, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		
-		for (int i =0; i < subitemsCount; i++) {
-			String action = createAction(newline);
-			buffer.append(createSubItem(action, newline));
-		}
-		
-		ISimpleCSItem item = process(buffer.toString(), newline);
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			ISimpleCSSubItemObject subitem = item.getSubItems()[i];
-			validateSubItem(subitem);
-			
-			SimpleCSSubItem simpleSubitem = (SimpleCSSubItem) subitem;
-			validateAction(simpleSubitem.getExecutable());
-		}
-	}
-	
-	public void simpleRepeatedSubItemTestCase(int subitemsCount, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		
-		for (int i =0; i < subitemsCount; i++) {
-			buffer.append(createRepeatedSubItem("", newline));
-		}
-		
-		ISimpleCSItem item = process(buffer.toString(), newline);
-		
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			validateRepeatedSubItem(item.getSubItems()[i]);
-		}
-	}
-	
-	public void simpleConditionalSubItemTestCase(int subitemsCount, String newline) {
-		StringBuffer buffer = new StringBuffer();
-		
-		for (int i =0; i < subitemsCount; i++) {
-			buffer.append(createConditionalSubItem("", newline));
-		}
-		
-		ISimpleCSItem item = process(buffer.toString(), newline);
-				
-		validateSubItemsCount(subitemsCount, item);
-		
-		for (int i = 0; i < subitemsCount; i++) {
-			validateConditionalSubItem(item.getSubItems()[i]);
-		}
-	}
-	
-	public ISimpleCSItem process(String subitems, String newline) {
-		StringBuffer buffer = createSimpleCSItem(subitems, newline);
-		
-		setXMLContents(buffer, newline);
-		load();
-		
-		ISimpleCS model = fModel.getSimpleCS();
-		
-		validateItemsCount(1, model);
-		return model.getItems()[0];
-	}
-
-
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/ctxhelp/AllCtxHelpModelTests.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/ctxhelp/AllCtxHelpModelTests.java
deleted file mode 100644
index 9948fd2..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/ctxhelp/AllCtxHelpModelTests.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.ctxhelp;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllCtxHelpModelTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for testing the toc model"); //$NON-NLS-1$
-		return suite;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/toc/AllTocModelTests.java b/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/toc/AllTocModelTests.java
deleted file mode 100644
index 16b420b..0000000
--- a/ua/org.eclipse.pde.ua.tests/src/org/eclipse/pde/internal/ua/tests/toc/AllTocModelTests.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.tests.toc;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTocModelTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for testing the context help model"); //$NON-NLS-1$
-		return suite;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/.classpath b/ua/org.eclipse.pde.ua.ui/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/ua/org.eclipse.pde.ua.ui/.classpath
+++ /dev/null

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

diff --git a/ua/org.eclipse.pde.ua.ui/.cvsignore b/ua/org.eclipse.pde.ua.ui/.cvsignore
deleted file mode 100644
index 3aef9b8..0000000
--- a/ua/org.eclipse.pde.ua.ui/.cvsignore
+++ /dev/null

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

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.ua.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.core.resources.prefs b/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 1a4cdbd..0000000
--- a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Fri Oct 20 13:22:13 EDT 2006
-eclipse.preferences.version=1
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/default.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/implied.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/osname.aliases=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases=UTF-8
-encoding/<project>=ISO-8859-1

diff --git a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 55942c1..0000000
--- a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,330 +0,0 @@
-#Wed Jan 21 13:37:28 EST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-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.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-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.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.ui.prefs b/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 38976b0..0000000
--- a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,113 +0,0 @@
-#Wed Jan 21 21:41:03 CET 2009
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.ondemandthreshold=5
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.core.prefs b/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.core.prefs
deleted file mode 100755
index a3a0809..0000000
--- a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Wed Mar 29 00:38:44 EST 2006
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.pde.core/binary

diff --git a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.prefs b/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 3e76285..0000000
--- a/ua/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,22 +0,0 @@
-#Wed May 14 16:45:25 CDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1

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

@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde.ua.ui;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.pde.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.ua.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.pde.internal.ua.ui;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.cheatsheet;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.ctxhelp;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.toc;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.toc.actions;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.editor.toc.details;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.wizards.ctxhelp;x-internal:=true,
- org.eclipse.pde.internal.ua.ui.wizards.toc;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin

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

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ua/org.eclipse.pde.ua.ui/build.properties b/ua/org.eclipse.pde.ua.ui/build.properties
deleted file mode 100644
index 6c551f6..0000000
--- a/ua/org.eclipse.pde.ua.ui/build.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/
-src.includes = about.html

diff --git a/ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.gif b/ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.gif
deleted file mode 100644
index 456f53b..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.gif b/ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.gif
deleted file mode 100755
index d910b2b..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.gif b/ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.gif
deleted file mode 100644
index ab95458..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.gif
deleted file mode 100755
index 0ca77b2..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.gif
deleted file mode 100755
index 0bc9b07..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.gif
deleted file mode 100755
index a27acc4..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.gif
deleted file mode 100755
index 4995125..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.gif
deleted file mode 100755
index 03ff4bc..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.gif
deleted file mode 100755
index 6e63b99..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.gif
deleted file mode 100755
index 22fddb0..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.gif
deleted file mode 100755
index 85cc683..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.gif
deleted file mode 100755
index 9a0d0a6..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.gif
+++ /dev/null
Binary files differ

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

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

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.gif
deleted file mode 100644
index 484d828..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.gif
deleted file mode 100755
index f58992d..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.gif
deleted file mode 100755
index b226e41..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.gif
deleted file mode 100755
index 504acb2..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.gif
deleted file mode 100755
index 9e665d5..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.gif b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.gif
deleted file mode 100755
index f32c28d..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.png b/ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.png
deleted file mode 100644
index e9af471..0000000
--- a/ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.png
+++ /dev/null
Binary files differ

diff --git a/ua/org.eclipse.pde.ua.ui/plugin.properties b/ua/org.eclipse.pde.ua.ui/plugin.properties
deleted file mode 100644
index 796a5ea..0000000
--- a/ua/org.eclipse.pde.ua.ui/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-#Properties file for org.eclipse.pde.ua.ui
-pluginName = PDE UA UI
-providerName = Eclipse.org
-
-simple.cheat.sheat.editor.name = Simple Cheat Sheet Editor
-composite.cheat.sheat.editor.name = Composite Cheat Sheet Editor
-
-toc.editor = Table of Contents Editor
-ctxhelp.editor = Context Help Editor
-
-new.toc.name=Help Table of Contents
-new.toc.description=Create a Table of Contents
-new.ctxhelp.name=Context Help
-new.ctxhelp.description=Create a Context Help file
-new.cheat.sheet = Cheat Sheet
-new.cheat.sheet.description = Create a Cheat Sheet
-
-category.name.user.assistance = User Assistance

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

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            class="org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSEditor"
-            contributorClass="org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSEditorContributor"
-            icon="$nl$/icons/obj16/cheatsheet_obj.gif"
-            id="org.eclipse.pde.ua.ui.simpleCheatSheetEditor"
-            name="%simple.cheat.sheat.editor.name">
-         <contentTypeBinding
-               contentTypeId="org.eclipse.pde.simpleCheatSheet">
-         </contentTypeBinding>
-      </editor>
-      <editor
-            class="org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.CompCSEditor"
-            contributorClass="org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.CompCSEditorContributor"
-            icon="$nl$/icons/obj16/cheatsheet_obj.gif"
-            id="org.eclipse.pde.ua.ui.compositeCheatSheetEditor"
-            name="%composite.cheat.sheat.editor.name">
-         <contentTypeBinding
-               contentTypeId="org.eclipse.pde.compositeCheatSheet">
-         </contentTypeBinding>
-      </editor>
-      <editor
-            class="org.eclipse.pde.internal.ua.ui.editor.toc.TocEditor"
-            contributorClass="org.eclipse.pde.internal.ua.ui.editor.toc.TocEditorContributor"
-            default="true"
-            icon="$nl$/icons/obj16/toc_obj.gif"
-            id="org.eclipse.pde.ua.ui.tocEditor"
-            name="%toc.editor">
-         <contentTypeBinding
-               contentTypeId="org.eclipse.pde.tocFile">
-         </contentTypeBinding>
-      </editor>
-      <editor
-            class="org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpEditor"
-            contributorClass="org.eclipse.pde.internal.ua.ui.editor.toc.TocEditorContributor"
-            default="true"
-            icon="$nl$/icons/obj16/toc_obj.gif"
-            id="org.eclipse.pde.ua.ui.ctxHelpEditor"
-            name="%ctxhelp.editor">
-         <contentTypeBinding
-               contentTypeId="org.eclipse.pde.ctxHelpFile">
-         </contentTypeBinding>
-      </editor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            id="org.eclipse.pde.userAssistance"
-            name="%category.name.user.assistance">
-      </category>
-      <wizard
-            category="org.eclipse.pde.userAssistance"
-            class="org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.NewCSFileWizard"
-            icon="$nl$/icons/etool16/new_cheatsheet_wiz.gif"
-            id="org.eclipse.pde.ua.ui.NewCheatSheetWizard"
-            name="%new.cheat.sheet">
-         <description>
-            %new.cheat.sheet.description
-         </description>
-      </wizard>
-      <wizard
-            category="org.eclipse.pde.userAssistance"
-            class="org.eclipse.pde.internal.ua.ui.wizards.toc.NewTocFileWizard"
-            icon="$nl$/icons/etool16/toc_wiz.gif"
-            id="org.eclipse.pde.ua.ui.NewTOCWizard"
-            name="%new.toc.name">
-         <description>
-            %new.toc.description
-         </description>
-      </wizard>
-      <wizard
-            category="org.eclipse.pde.userAssistance"
-            class="org.eclipse.pde.internal.ua.ui.wizards.ctxhelp.NewCtxHelpWizard"
-            icon="$nl$/icons/etool16/ctx_help_wiz.gif"
-            id="org.eclipse.pde.ua.ui.NewContextHelpWizard"
-            name="%new.ctxhelp.name">
-         <description>
-            %new.ctxhelp.description
-         </description>
-      </wizard>
-   </extension>
-
-</plugin>

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/IConstants.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/IConstants.java
deleted file mode 100644
index e165590..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/IConstants.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui;
-
-public interface IConstants {
-
-	public static final String COMPOSITE_CHEAT_SHEET_EDITOR_ID = PDEUserAssistanceUIPlugin.PLUGIN_ID
-			+ ".compositeCheatSheetEditor"; //$NON-NLS-1$
-	public static final String SIMPLE_CHEAT_SHEET_EDITOR_ID = PDEUserAssistanceUIPlugin.PLUGIN_ID
-			+ "simpleCheatSheetEditor"; //$NON-NLS-1$
-	public static final String CONTEXT_HELP_EDITOR_ID = PDEUserAssistanceUIPlugin.PLUGIN_ID
-			+ ".ctxHelpEditor"; //$NON-NLS-1$
-	public static final String TABLE_OF_CONTENTS_EDITOR_ID = PDEUserAssistanceUIPlugin.PLUGIN_ID
-			+ ".tocEditor"; //$NON-NLS-1$
-	public static final String SIMPLE_CHEAT_SHEET_CONTENT_ID = "org.eclipse.pde.simpleCheatSheet"; //$NON-NLS-1$
-	public static final String TABLE_OF_CONTENTS_CONTENT_ID = "org.eclipse.pde.tocFile"; //$NON-NLS-1$
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceLabelProvider.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceLabelProvider.java
deleted file mode 100644
index 575df57..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceLabelProvider.java
+++ /dev/null

@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui;
-
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.eclipse.pde.internal.ua.core.ctxhelp.ICtxHelpConstants;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-public class PDEUserAssistanceLabelProvider extends SharedLabelProvider {
-	public PDEUserAssistanceLabelProvider() {
-	}
-
-	public String getText(Object obj) {
-		if (obj instanceof ISimpleCSObject) {
-			return getObjectText((ISimpleCSObject) obj);
-		}
-		if (obj instanceof ICompCSObject) {
-			return getObjectText((ICompCSObject) obj);
-		}
-		if (obj instanceof TocObject) {
-			return getObjectText((TocObject) obj);
-		}
-		if (obj instanceof CtxHelpObject) {
-			return getObjectText((CtxHelpObject) obj);
-		}
-		return super.getText(obj);
-	}
-
-	public String getObjectText(ISimpleCSObject obj) {
-		int limit = 50;
-
-		if (obj.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-			limit = 40;
-		} else if (obj.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			limit = 36;
-		} else if (obj.getType() == ISimpleCSConstants.TYPE_INTRO) {
-			limit = 36;
-		} else if (obj.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			limit = 32;
-		}
-		return PDETextHelper.truncateAndTrailOffText(PDETextHelper.translateReadText(obj.getName()), limit);
-	}
-
-	public String getObjectText(ICompCSObject obj) {
-		int limit = 40;
-		ICompCSObject parent = obj.getParent();
-		while (parent != null) {
-			limit = limit - 4;
-			parent = parent.getParent();
-		}
-		return PDETextHelper.truncateAndTrailOffText(PDETextHelper.translateReadText(obj.getName()), limit);
-	}
-
-	/**
-	 * @param obj
-	 */
-	public String getObjectText(TocObject obj) {
-		return PDETextHelper.translateReadText(obj.getName());
-	}
-
-	public String getObjectText(CtxHelpObject obj) {
-		return PDETextHelper.translateReadText(obj.getName());
-	}
-
-	public Image getImage(Object obj) {
-		if (obj instanceof ISimpleCSObject) {
-			return getObjectImage((ISimpleCSObject) obj);
-		}
-		if (obj instanceof ICompCSObject) {
-			return getObjectImage((ICompCSObject) obj);
-		}
-		if (obj instanceof TocObject) {
-			return getObjectImage((TocObject) obj);
-		}
-		if (obj instanceof CtxHelpObject) {
-			return getObjectImage((CtxHelpObject) obj);
-		}
-		return super.getImage(obj);
-	}
-
-	private Image getObjectImage(ISimpleCSObject object) {
-
-		if (object.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_CSITEM_OBJ);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_CSSUBITEM_OBJ);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_REPEATED_SUBITEM) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_CSUNSUPPORTED_OBJ);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_CONDITIONAL_SUBITEM) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_CSUNSUPPORTED_OBJ);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_SIMPLECS_OBJ);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_INTRO) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_CSINTRO_OBJ);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_PERFORM_WHEN) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_CSUNSUPPORTED_OBJ);
-		}
-		return get(PDEUserAssistanceUIPluginImages.DESC_SIMPLECS_OBJ, F_ERROR);
-	}
-
-	/**
-	 * @param object
-	 */
-	private Image getObjectImage(ICompCSObject object) {
-
-		if (object.getType() == ICompCSConstants.TYPE_TASK) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_SIMPLECS_OBJ);
-		} else if (object.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_CSTASKGROUP_OBJ);
-		} else if (object.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			return get(PDEUserAssistanceUIPluginImages.DESC_COMPCS_OBJ);
-		}
-		return get(PDEUserAssistanceUIPluginImages.DESC_SIMPLECS_OBJ, F_ERROR);
-	}
-
-	/**
-	 * @param object
-	 */
-	private Image getObjectImage(TocObject object) {
-		switch (object.getType()) {
-			case ITocConstants.TYPE_TOC : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_TOC_OBJ);
-			}
-			case ITocConstants.TYPE_TOPIC : { //Return the leaf topic icon for a topic with no children
-				if (object.getChildren().isEmpty()) {
-					return get(PDEUserAssistanceUIPluginImages.DESC_TOC_LEAFTOPIC_OBJ);
-				}
-				//Return the regular topic icon for a topic with children
-				return get(PDEUserAssistanceUIPluginImages.DESC_TOC_TOPIC_OBJ);
-			}
-			case ITocConstants.TYPE_LINK : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_TOC_LINK_OBJ);
-			}
-			case ITocConstants.TYPE_ANCHOR : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_TOC_ANCHOR_OBJ);
-			}
-			default :
-				return get(PDEUserAssistanceUIPluginImages.DESC_SIMPLECS_OBJ, F_ERROR);
-		}
-	}
-
-	/**
-	 * @param object
-	 */
-	private Image getObjectImage(CtxHelpObject object) {
-		switch (object.getType()) {
-			case ICtxHelpConstants.TYPE_ROOT : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_TOC_OBJ);
-			}
-			case ICtxHelpConstants.TYPE_CONTEXT : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_CTXHELP_CONTEXT_OBJ);
-			}
-			case ICtxHelpConstants.TYPE_DESCRIPTION : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_CTXHELP_DESC_OBJ);
-			}
-			case ICtxHelpConstants.TYPE_TOPIC : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_TOC_LEAFTOPIC_OBJ);
-			}
-			case ICtxHelpConstants.TYPE_COMMAND : {
-				return get(PDEUserAssistanceUIPluginImages.DESC_CTXHELP_COMMAND_OBJ);
-			}
-			default :
-				return get(PDEUserAssistanceUIPluginImages.DESC_SIMPLECS_OBJ, F_ERROR);
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPlugin.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPlugin.java
deleted file mode 100644
index b80f302..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPlugin.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class PDEUserAssistanceUIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.pde.ua.ui";
-
-	// The shared instance
-	private static PDEUserAssistanceUIPlugin plugin;
-
-	private PDEUserAssistanceLabelProvider fLabelProvider;
-	
-	/**
-	 * The constructor
-	 */
-	public PDEUserAssistanceUIPlugin() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static PDEUserAssistanceUIPlugin getDefault() {
-		return plugin;
-	}
-	
-	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 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, PLUGIN_ID, IStatus.OK,
-					message, e);
-		}
-		ResourcesPlugin.getPlugin().getLog().log(status);
-		Display display = Display.getCurrent() == null ? Display.getCurrent()
-				: Display.getDefault();
-		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 IWorkbenchPage getActivePage() {
-		return getActiveWorkbenchWindow().getActivePage();
-	}
-	
-	public PDEUserAssistanceLabelProvider getLabelProvider() {
-		if (fLabelProvider == null)
-			fLabelProvider = new PDEUserAssistanceLabelProvider();
-		return fLabelProvider;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPluginImages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPluginImages.java
deleted file mode 100644
index 9112b48..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/PDEUserAssistanceUIPluginImages.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Bundle of all images used by the PDE User Assistance UI plugin.
- */
-public class PDEUserAssistanceUIPluginImages {
-
-	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_WIZBAN = ICONS_PATH + "wizban/"; //$NON-NLS-1$
-
-	/**
-	 * OBJ16
-	 */
-	public static final ImageDescriptor DESC_SIMPLECS_OBJ = create(PATH_OBJ, "cheatsheet_simple_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COMPCS_OBJ = create(PATH_OBJ, "cheatsheet_composite_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CSTASKGROUP_OBJ = create(PATH_OBJ, "cheatsheet_taskgroup_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CSITEM_OBJ = create(PATH_OBJ, "cheatsheet_item_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CSSUBITEM_OBJ = create(PATH_OBJ, "cheatsheet_subitem_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CSINTRO_OBJ = create(PATH_OBJ, "cheatsheet_intro_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CSCONCLUSION_OBJ = create(PATH_OBJ, "cheatsheet_conclusion_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CSUNSUPPORTED_OBJ = create(PATH_OBJ, "cheatsheet_unsupported_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CHEATSHEET_OBJ = create(PATH_OBJ, "cheatsheet_obj.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_TOC_OBJ = create(PATH_OBJ, "toc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TOC_TOPIC_OBJ = create(PATH_OBJ, "toc_topic_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TOC_LEAFTOPIC_OBJ = create(PATH_OBJ, "toc_leaftopic_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TOC_LINK_OBJ = create(PATH_OBJ, "toc_link_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TOC_ANCHOR_OBJ = create(PATH_OBJ, "toc_anchor_obj.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_CTXHELP_CONTEXT_OBJ = create(PATH_OBJ, "ctxhelp_context_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CTXHELP_DESC_OBJ = create(PATH_OBJ, "ctxhelp_desc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CTXHELP_COMMAND_OBJ = create(PATH_OBJ, "ctxhelp_command_obj.gif"); //$NON-NLS-1$
-
-	/**
-	 * WIZ
-	 */
-	public static final ImageDescriptor DESC_CHEATSHEET_WIZ = create(PATH_WIZBAN, "new_cheatsheet_wiz.png"); //$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();
-	}
-
-	private static URL makeImageURL(String prefix, String name) {
-		String path = "$nl$/" + prefix + name; //$NON-NLS-1$
-		return FileLocator.find(PDEUserAssistanceUIPlugin.getDefault().getBundle(), new Path(path), null);
-	}
-
-	public static Image manage(String key, ImageDescriptor desc) {
-		Image image = desc.createImage();
-		PLUGIN_REGISTRY.put(key, image);
-		return image;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java
deleted file mode 100755
index 0d2e3ab..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.editor.PDEDetails;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * CSAbstractDetails
- */
-public abstract class CSAbstractDetails extends PDEDetails implements ICSDetails {
-
-	private ICSMaster fMasterSection;
-
-	private String fContextID;
-
-	/**
-	 * 
-	 */
-	public CSAbstractDetails(ICSMaster masterSection, String contextID) {
-		fMasterSection = masterSection;
-		fContextID = contextID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		configureParentLayout(parent);
-		createDetails(parent);
-		hookListeners();
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void configureParentLayout(Composite parent) {
-		parent.setLayout(FormLayoutFactory.createDetailsGridLayout(false, 1));
-	}
-
-	/**
-	 * @param parent
-	 */
-	public abstract void createDetails(Composite parent);
-
-	/**
-	 * 
-	 */
-	public abstract void updateFields();
-
-	/**
-	 * 
-	 */
-	public abstract void hookListeners();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// NO-OP
-		// Children to override
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#fireSaveNeeded()
-	 */
-	public void fireSaveNeeded() {
-		markDirty();
-		getPage().getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#getContextId()
-	 */
-	public String getContextId() {
-		return fContextID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#getPage()
-	 */
-	public PDEFormPage getPage() {
-		return (PDEFormPage) getManagedForm().getContainer();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#isEditable()
-	 */
-	public boolean isEditable() {
-		return fMasterSection.isEditable();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// NO-OP
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isEditableElement() {
-		return fMasterSection.isEditable();
-	}
-
-	/**
-	 * @return
-	 */
-	public FormToolkit getToolkit() {
-		return getManagedForm().getToolkit();
-	}
-
-	/**
-	 * @return
-	 */
-	public ICSMaster getMasterSection() {
-		return fMasterSection;
-	}
-
-	/**
-	 * @param selection
-	 * @return
-	 */
-	protected Object getFirstSelectedObject(ISelection selection) {
-		// Get the structured selection (obtained from the master tree viewer)
-		IStructuredSelection structuredSel = ((IStructuredSelection) selection);
-		// Ensure we have a selection
-		if (structuredSel == null) {
-			return null;
-		}
-		return structuredSel.getFirstElement();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractEditor.java
deleted file mode 100644
index 5a09c9d..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractEditor.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet;
-
-import org.eclipse.jface.action.ControlContribution;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.RegisterCSWizard;
-import org.eclipse.pde.internal.ui.editor.MultiSourceEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-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.ImageHyperlink;
-
-public abstract class CSAbstractEditor extends MultiSourceEditor {
-
-	private ImageHyperlink fImageHyperlinkRegisterCS;
-
-	public void contributeToToolbar(IToolBarManager manager) {
-		// Add the register cheat sheet link to the form title area
-		if (WorkspaceModelManager.isPluginProject(getCommonProject())
-				&& getAggregateModel().isEditable())
-			manager.add(createUIControlConRegisterCS());
-	}
-
-	/**
-	 * @return
-	 */
-	private ControlContribution createUIControlConRegisterCS() {
-		return new ControlContribution("Register") { //$NON-NLS-1$
-			protected Control createControl(Composite parent) {
-				// Create UI
-				createUIImageHyperlinkRegisterCS(parent);
-				// Create Listener
-				createUIListenerImageHyperlinkRegisterCS();
-				return fImageHyperlinkRegisterCS;
-			}
-		};
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIImageHyperlinkRegisterCS(Composite parent) {
-		fImageHyperlinkRegisterCS = new ImageHyperlink(parent, SWT.NONE);
-		fImageHyperlinkRegisterCS.setText(Messages.CSAbstractEditor_register);
-		fImageHyperlinkRegisterCS.setUnderlined(true);
-		fImageHyperlinkRegisterCS.setForeground(getToolkit()
-				.getHyperlinkGroup().getForeground());
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenerImageHyperlinkRegisterCS() {
-		fImageHyperlinkRegisterCS
-				.addHyperlinkListener(new IHyperlinkListener() {
-					public void linkActivated(HyperlinkEvent e) {
-						handleLinkActivatedRegisterCS();
-					}
-
-					public void linkEntered(HyperlinkEvent e) {
-						handleLinkEnteredRegisterCS(e.getLabel());
-					}
-
-					public void linkExited(HyperlinkEvent e) {
-						handleLinkExitedRegisterCS();
-					}
-				});
-	}
-
-	/**
-	 * @param message
-	 */
-	private void handleLinkEnteredRegisterCS(String message) {
-		// Update colour
-		fImageHyperlinkRegisterCS.setForeground(getToolkit()
-				.getHyperlinkGroup().getActiveForeground());
-		// Update IDE status line
-		getEditorSite().getActionBars().getStatusLineManager().setMessage(
-				message);
-	}
-
-	/**
-	 *
-	 */
-	private void handleLinkExitedRegisterCS() {
-		// Update colour
-		fImageHyperlinkRegisterCS.setForeground(getToolkit()
-				.getHyperlinkGroup().getForeground());
-		// Update IDE status line
-		getEditorSite().getActionBars().getStatusLineManager().setMessage(null);
-	}
-
-	/**
-	 * 
-	 */
-	private void handleLinkActivatedRegisterCS() {
-		RegisterCSWizard wizard = new RegisterCSWizard(
-				(IModel) getAggregateModel());
-		// Initialize the wizard
-		wizard.init(PlatformUI.getWorkbench(), null);
-		// Create the dialog for the wizard
-		WizardDialog dialog = new WizardDialog(PDEUserAssistanceUIPlugin
-				.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		// Configure the dialogs size
-		dialog.getShell().setSize(400, 370);
-		// Check the result
-		if (dialog.open() == Window.OK) {
-			// TODO: MP: COMPCS: HIGH: Automatic save of editor after creating
-			// simple cheat sheet?
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractSubDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractSubDetails.java
deleted file mode 100755
index 2687b40..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractSubDetails.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * CSAbstractSubDetails
- */
-public abstract class CSAbstractSubDetails extends CSAbstractDetails {
-
-	/**
-	 * @param masterSection
-	 * @param contextID
-	 */
-	public CSAbstractSubDetails(ICSMaster masterSection, String contextID) {
-		super(masterSection, contextID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		// NO-OP
-		// This will never be called directly because classes extending this
-		// class are subsets of a main details page
-		// To create the contents for a the subset of the main details pages,
-		// calls to the ICSDetails methods are made directly
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSDetails.java
deleted file mode 100755
index 65a5be9..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSDetails.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * ICSDetails
- */
-public interface ICSDetails {
-
-	/**
-	 * @param parent
-	 */
-	public void createDetails(Composite parent);
-
-	/**
-	 * 
-	 */
-	public void updateFields();
-
-	/**
-	 * 
-	 */
-	public void hookListeners();
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSMaster.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSMaster.java
deleted file mode 100755
index 414fec7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSMaster.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet;
-
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * ICSMaster
- */
-public interface ICSMaster {
-
-	/**
-	 * 
-	 */
-	public void updateButtons();
-
-	/**
-	 * @return
-	 */
-	public boolean isEditable();
-
-	/**
-	 * Special case:  Need to set the selection after the full UI is created
-	 * in order to properly fire an event to summon up the right details 
-	 * section
-	 */
-	public void fireSelection();
-
-	/**
-	 * @return
-	 */
-	public Section getSection();
-
-	/**
-	 * @param object
-	 * @return
-	 */
-	public boolean setFormInput(Object object);
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/Messages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/Messages.java
deleted file mode 100644
index e6db922..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/Messages.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.cheatsheet.messages"; //$NON-NLS-1$
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-
-	public static String CSAbstractEditor_register;
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSBlock.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSBlock.java
deleted file mode 100755
index 215998e..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSBlock.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details.CompCSDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details.CompCSTaskDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details.CompCSTaskGroupDetails;
-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.forms.DetailsPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IDetailsPageProvider;
-import org.eclipse.ui.forms.IManagedForm;
-
-/**
- * CompCSBlock
- *
- */
-public class CompCSBlock extends PDEMasterDetailsBlock implements IModelChangedListener, IDetailsPageProvider {
-
-	private CompCSMasterTreeSection fMasterSection;
-
-	private CompCSDetails fDetails;
-
-	private CompCSTaskGroupDetails fTaskGroupDetails;
-
-	private CompCSTaskDetails fTaskDetails;
-
-	/**
-	 * @param page
-	 */
-	public CompCSBlock(PDEFormPage page) {
-		super(page);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock#createMasterSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)
-	 */
-	protected PDESection createMasterSection(IManagedForm managedForm, Composite parent) {
-		fMasterSection = new CompCSMasterTreeSection(getPage(), parent);
-		return fMasterSection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.forms.DetailsPart)
-	 */
-	protected void registerPages(DetailsPart detailsPart) {
-		// Only static pages to be defined.  Do not cache pages
-		detailsPart.setPageLimit(0);
-		// Register static page:  compositeCheatsheet
-		fDetails = new CompCSDetails(fMasterSection);
-		detailsPart.registerPage(CompCSDetails.class, fDetails);
-		// Register static page:  taskGroup
-		fTaskGroupDetails = new CompCSTaskGroupDetails(fMasterSection);
-		detailsPart.registerPage(CompCSTaskGroupDetails.class, fTaskGroupDetails);
-		// Register static page:  task
-		fTaskDetails = new CompCSTaskDetails(fMasterSection);
-		detailsPart.registerPage(CompCSTaskDetails.class, fTaskDetails);
-		// Set this class as the page provider
-		detailsPart.setPageProvider(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPageKey(java.lang.Object)
-	 */
-	public Object getPageKey(Object object) {
-		// Get static page key
-		if (object instanceof ICompCS) {
-			// Static page:  compositeCheatsheet
-			return CompCSDetails.class;
-		} else if (object instanceof ICompCSTaskGroup) {
-			// Static page:  taskGroup
-			return CompCSTaskGroupDetails.class;
-		} else if (object instanceof ICompCSTask) {
-			// Static page:  task
-			return CompCSTaskDetails.class;
-		}
-		// Should never reach here
-		return object.getClass();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPage(java.lang.Object)
-	 */
-	public IDetailsPage getPage(Object key) {
-		// No dynamic pages.  Static pages already registered
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// Inform the master section
-		if (fMasterSection != null) {
-			fMasterSection.modelChanged(event);
-		}
-		// Inform the details section
-		// Unnecessary
-		//if (fCurrentDetailsSection != null) {
-		//	fCurrentDetailsSection.modelChanged(event);
-		//}
-	}
-
-	/**
-	 * @return
-	 */
-	public CompCSMasterTreeSection getMastersSection() {
-		return fMasterSection;
-	}
-
-	/**
-	 * @return
-	 */
-	public ISelection getSelection() {
-		if (fMasterSection != null) {
-			return fMasterSection.getSelection();
-		}
-		return null;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSContentProvider.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSContentProvider.java
deleted file mode 100755
index 41c0473..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSContentProvider.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-
-/**
- * CompCSContentProvider
- * 
- */
-public class CompCSContentProvider implements ITreeContentProvider {
-
-	public CompCSContentProvider() {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.
-	 * Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof ICompCSModel) {
-			return new Object[] { ((ICompCSModel) parentElement).getCompCS() };
-		} else if (parentElement instanceof ICompCSObject) {
-			List list = ((ICompCSObject) parentElement).getChildren();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-		return new Object[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object
-	 * )
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof ICompCSObject) {
-			return ((ICompCSObject) element).getParent();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.
-	 * Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return (getChildren(element).length > 0);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java
-	 * .lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	public void dispose() {
-		// no op
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// no op
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditor.java
deleted file mode 100755
index 31c0ef4..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditor.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractEditor;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-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;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-
-public class CompCSEditor extends CSAbstractEditor {
-
-	/**
-	 * 
-	 */
-	public CompCSEditor() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getEditorID()
-	 */
-	protected String getEditorID() {
-		return IConstants.COMPOSITE_CHEAT_SHEET_EDITOR_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getContextIDForSaveAs()
-	 */
-	public String getContextIDForSaveAs() {
-		return CompCSInputContext.CONTEXT_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#addEditorPages()
-	 */
-	protected void addEditorPages() {
-		try {
-			addPage(new CompCSPage(this));
-		} catch (PartInitException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createContentOutline()
-	 */
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new CompCSFormOutlinePage(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createInputContextManager()
-	 */
-	protected InputContextManager createInputContextManager() {
-		return new CompCSInputContextManager(this);
-	}
-
-	/* (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 contexts, IFileEditorInput input) {
-		contexts.putContext(input, new CompCSInputContext(this, input, true));
-		contexts.monitorFile(input.getFile());
-	}
-
-	/* (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 contexts, IStorageEditorInput input) {
-		contexts.putContext(input, new CompCSInputContext(this, input, true));
-	}
-
-	/* (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 contexts, FileStoreEditorInput input) {
-		try {
-			IFileStore store = EFS.getStore(input.getURI());
-			IEditorInput in = new FileStoreEditorInput(store);
-			contexts.putContext(in, new CompCSInputContext(this, in, true));
-		} catch (CoreException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#editorContextAdded(org.eclipse.pde.internal.ui.editor.context.InputContext)
-	 */
-	public void editorContextAdded(InputContext context) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		return fInputContextManager.findContext(CompCSInputContext.CONTEXT_ID);
-	}
-
-	/* (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(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileAdded(org.eclipse.core.resources.IFile)
-	 */
-	public void monitoredFileAdded(IFile monitoredFile) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileRemoved(org.eclipse.core.resources.IFile)
-	 */
-	public boolean monitoredFileRemoved(IFile monitoredFile) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getSelection()
-	 */
-	public ISelection getSelection() {
-		// Override the parent getSelection because it doesn't work.
-		// The selection provider operates at the form level and does not 
-		// track selections made in the master tree view.
-		// The selection is required to synchronize the master tree view with 
-		// the outline view
-		IFormPage formPage = getActivePageInstance();
-		if ((formPage != null) && (formPage instanceof CompCSPage)) {
-			// Synchronizes the selection made in the master tree view with the
-			// selection in the outline view when the link with editor button
-			// is toggled on
-			return ((CompCSPage) formPage).getSelection();
-		}
-		return super.getSelection();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditorContributor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditorContributor.java
deleted file mode 100755
index 7469b48..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditorContributor.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import org.eclipse.pde.internal.ui.editor.PDEFormEditorContributor;
-
-/**
- * CompCSEditorContributor
- *
- */
-public class CompCSEditorContributor extends PDEFormEditorContributor {
-
-	/**
-	 * @param menuName
-	 */
-	public CompCSEditorContributor() {
-		super("compCSEditor"); //$NON-NLS-1$
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFileValidator.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFileValidator.java
deleted file mode 100755
index 2ced473..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFileValidator.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class CompCSFileValidator implements ISelectionStatusValidator {
-
-	public CompCSFileValidator() {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ui.dialogs.ISelectionStatusValidator#validate(java.lang.Object
-	 * [])
-	 */
-	public IStatus validate(Object[] selection) {
-
-		// Ensure something was selected
-		if (selection.length == 0) {
-			return errorStatus(""); //$NON-NLS-1$
-		}
-		// Ensure we have a file
-		if ((selection[0] instanceof IFile) == false) {
-			return errorStatus(""); //$NON-NLS-1$
-		}
-		IFile file = (IFile) selection[0];
-		// Ensure we have a simple cheat sheet file
-		if (isSimpleCSFile(file) == false) {
-			return errorStatus(Messages.CompCSFileValidator_0);
-		}
-		// If we got this far, we have a valid file
-		return okStatus(""); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * @param file
-	 */
-	private boolean isSimpleCSFile(IFile file) {
-		try {
-			IContentDescription description = file.getContentDescription();
-			IContentType type = description.getContentType();
-			return type.getId().equalsIgnoreCase(
-					IConstants.SIMPLE_CHEAT_SHEET_CONTENT_ID);
-		} catch (CoreException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-		return false;
-	}
-
-	/**
-	 * @param message
-	 * @return
-	 */
-	private IStatus errorStatus(String message) {
-		return new Status(IStatus.ERROR, PDEUserAssistanceUIPlugin.PLUGIN_ID,
-				IStatus.ERROR, message, null);
-	}
-
-	/**
-	 * @param message
-	 * @return
-	 */
-	private IStatus okStatus(String message) {
-		return new Status(IStatus.OK, PDEUserAssistanceUIPlugin.PLUGIN_ID,
-				IStatus.OK, message, null);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFormOutlinePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFormOutlinePage.java
deleted file mode 100755
index a67bb73..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFormOutlinePage.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-
-public class CompCSFormOutlinePage extends FormOutlinePage {
-
-	/**
-	 * @param editor
-	 */
-	public CompCSFormOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/**
-	 * CompCSLabelProvider
-	 *
-	 */
-	private class CompCSLabelProvider extends BasicLabelProvider {
-		public CompCSLabelProvider(ILabelProvider ilp) {
-			super(ilp);
-		}
-
-		public String getText(Object obj) {
-			if (obj instanceof ICompCSObject) {
-				return getObjectText((ICompCSObject) obj);
-			}
-			return super.getText(obj);
-		}
-	}
-
-	/**
-	 * @param obj
-	 * @return
-	 */
-	protected String getObjectText(ICompCSObject obj) {
-		int limit = 50;
-
-		if (obj.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			limit = 30;
-		} else if (obj.getType() == ICompCSConstants.TYPE_TASK) {
-			limit = 26;
-		} else if (obj.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			limit = 22;
-		}
-
-		return PDETextHelper.truncateAndTrailOffText(PDETextHelper.translateReadText(obj.getName()), limit);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getChildren(java.lang.Object)
-	 */
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof CompCSPage) {
-			ICompCSModel cheatsheet = (ICompCSModel) fEditor.getAggregateModel();
-			if ((cheatsheet != null) && cheatsheet.isLoaded()) {
-				Object[] list = new Object[1];
-				list[0] = cheatsheet.getCompCS();
-				return list;
-			}
-		} else if (parent instanceof ICompCSObject) {
-			List list = ((ICompCSObject) parent).getChildren();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-		return super.getChildren(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#createLabelProvider()
-	 */
-	public ILabelProvider createLabelProvider() {
-		return new CompCSLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getParentPageId(java.lang.Object)
-	 */
-	protected String getParentPageId(Object item) {
-		return CompCSPage.PAGE_ID;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java
deleted file mode 100755
index 1109fc4..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-import org.eclipse.ui.forms.widgets.Form;
-
-/**
- * CompCSTreeValidator
- *
- */
-public class CompCSGroupValidator {
-
-	private Form fForm;
-
-	private HashSet fGroups;
-
-	private String fErrorCategory;
-
-	// TODO: MP: LOW: CompCS: Can augment the model to have isValid() methods to simplify validation
-
-	/**
-	 * 
-	 */
-	public CompCSGroupValidator(ICompCS cheatsheet, Form form, String errorCategory) {
-		fForm = form;
-		fErrorCategory = errorCategory;
-
-		fGroups = new HashSet();
-		populateGroups(cheatsheet);
-	}
-
-	/**
-	 * @param cheatsheet
-	 */
-	private void populateGroups(ICompCS cheatsheet) {
-		// Register all existing groups in the present workspace model to be
-		// validated
-		if (cheatsheet.getFieldTaskObject().getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			addGroup((ICompCSTaskGroup) cheatsheet.getFieldTaskObject());
-		}
-	}
-
-	/**
-	 * @param group
-	 */
-	public void addGroup(ICompCSTaskGroup group) {
-		fGroups.add(group);
-		// Check to see if the group has any children
-		if (group.hasFieldTaskObjects() == false) {
-			return;
-		}
-		// Recursively add any sub-groups
-		ICompCSTaskObject[] taskObjects = group.getFieldTaskObjects();
-		for (int i = 0; i < taskObjects.length; i++) {
-			if (taskObjects[i].getType() == ICompCSConstants.TYPE_TASKGROUP) {
-				addGroup((ICompCSTaskGroup) taskObjects[i]);
-			}
-		}
-	}
-
-	/**
-	 * @param group
-	 */
-	public void removeGroup(ICompCSTaskGroup group) {
-		fGroups.remove(group);
-		// Check to see if the group has any children
-		if (group.hasFieldTaskObjects() == false) {
-			return;
-		}
-		// Recursively remove any sub-groups
-		ICompCSTaskObject[] taskObjects = group.getFieldTaskObjects();
-		for (int i = 0; i < taskObjects.length; i++) {
-			if (taskObjects[i].getType() == ICompCSConstants.TYPE_TASKGROUP) {
-				removeGroup((ICompCSTaskGroup) taskObjects[i]);
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean validate() {
-		// Check to see if there is anything to validate
-		if (fGroups.isEmpty()) {
-			fForm.setMessage(null);
-			return true;
-		}
-		Iterator iterator = fGroups.iterator();
-		// Validate all registered groups
-		while (iterator.hasNext()) {
-			ICompCSTaskGroup group = (ICompCSTaskGroup) iterator.next();
-			if (validate(group) == false) {
-				return false;
-			}
-		}
-		fForm.setMessage(null);
-		return true;
-	}
-
-	/**
-	 * @param group
-	 * @return
-	 */
-	private boolean validate(ICompCSTaskGroup group) {
-		if (group.getFieldTaskObjectCount() == 0) {
-			String message = '[' + fErrorCategory + ']' + ' ' + PDETextHelper.translateReadText(group.getFieldName()) + ':' + ' ' + Messages.CompCSGroupValidator_errorChildlessGroup;
-			fForm.setMessage(message, IMessageProvider.INFORMATION);
-			return false;
-		}
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContext.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContext.java
deleted file mode 100755
index 8c9a21a..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContext.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import java.io.*;
-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.ua.core.cheatsheet.comp.CompCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSWorkspaceModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-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;
-
-/**
- * CompCSInputContext
- *
- */
-public class CompCSInputContext extends UTF8InputContext {
-
-	public static final String CONTEXT_ID = "compcs-context"; //$NON-NLS-1$	
-
-	/**
-	 * @param editor
-	 * @param input
-	 * @param primary
-	 */
-	public CompCSInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-
-	/* (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) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		ICompCSModel model = null;
-		if (input instanceof IStorageEditorInput) {
-			try {
-				if (input instanceof IFileEditorInput) {
-					IFile file = ((IFileEditorInput) input).getFile();
-					model = new CompCSWorkspaceModel(file, true);
-					model.load();
-				} else if (input instanceof IStorageEditorInput) {
-					InputStream is = new BufferedInputStream(((IStorageEditorInput) input).getStorage().getContents());
-					model = new CompCSModel();
-					model.load(is, false);
-				}
-			} catch (CoreException e) {
-				PDEUserAssistanceUIPlugin.logException(e);
-				return null;
-			}
-		}
-		return model;
-	}
-
-	/* (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#getPartitionName()
-	 */
-	protected String getPartitionName() {
-		return "___compcs_partition"; //$NON-NLS-1$
-	}
-
-	/* (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) == false) {
-			return;
-		}
-		IEditable editableModel = (IEditable) getModel();
-		// No need to flush the model if it is not dirty
-		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) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContextManager.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContextManager.java
deleted file mode 100755
index a869523..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContextManager.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-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;
-
-/**
- * CompCSInputContextManager
- */
-public class CompCSInputContextManager extends InputContextManager {
-
-	/**
-	 * @param editor
-	 */
-	public CompCSInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContextManager#getAggregateModel()
-	 */
-	public IBaseModel getAggregateModel() {
-		InputContext context = findContext(CompCSInputContext.CONTEXT_ID);
-		if (context == null) {
-			return null;
-		}
-		return context.getModel();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java
deleted file mode 100755
index 57f5d77..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java
+++ /dev/null

@@ -1,699 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.*;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions.CompCSAddGroupAction;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions.CompCSAddTaskAction;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions.CompCSRemoveTaskObjectAction;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TreeSection;
-import org.eclipse.pde.internal.ui.editor.actions.CollapseAction;
-import org.eclipse.pde.internal.ui.parts.TreePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.cheatsheets.OpenCheatSheetAction;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * CompCSMasterTreeSection
- *
- */
-public class CompCSMasterTreeSection extends TreeSection implements ICSMaster {
-
-	private static final int F_BUTTON_ADD_TASK = 0;
-
-	private static final int F_BUTTON_ADD_GROUP = 1;
-
-	private static final int F_BUTTON_REMOVE = 2;
-
-	private static final int F_BUTTON_UP = 3;
-
-	private static final int F_BUTTON_DOWN = 4;
-
-	private static final int F_BUTTON_PREVIEW = 5;
-
-	private static final int F_UP_FLAG = -1;
-
-	private static final int F_DOWN_FLAG = 1;
-
-	private TreeViewer fTreeViewer;
-
-	private ICompCSModel fModel;
-
-	private CollapseAction fCollapseAction;
-
-	private CompCSRemoveTaskObjectAction fRemoveTaskObjectAction;
-
-	private CompCSAddGroupAction fAddGroupAction;
-
-	private CompCSAddTaskAction fAddTaskAction;
-
-	private CompCSGroupValidator fGroupValidator;
-
-	/**
-	 * @param formPage
-	 * @param parent
-	 * @param style
-	 * @param buttonLabels
-	 */
-	public CompCSMasterTreeSection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, new String[] {Messages.CompCSMasterTreeSection_addTask, Messages.CompCSMasterTreeSection_addGroup, Messages.CompCSMasterTreeSection_Remove, Messages.CompCSMasterTreeSection_Up, Messages.CompCSMasterTreeSection_Down, Messages.CompCSMasterTreeSection_Preview});
-
-		// Create actions
-		fAddGroupAction = new CompCSAddGroupAction();
-		fAddTaskAction = new CompCSAddTaskAction();
-		fRemoveTaskObjectAction = new CompCSRemoveTaskObjectAction();
-		fCollapseAction = null;
-	}
-
-	/* (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) {
-		// Get the model
-		fModel = (ICompCSModel) getPage().getModel();
-
-		Composite container = createClientContainer(section, 2, toolkit);
-		createTree(container, toolkit);
-		toolkit.paintBordersFor(container);
-		section.setText(Messages.CompCSMasterTreeSection_Content);
-		section.setDescription(Messages.CompCSMasterTreeSection_sectionDesc);
-		section.setClient(container);
-		initializeTreeViewer();
-		createSectionToolbar(section, toolkit);
-	}
-
-	/**
-	 * @param container
-	 * @param toolkit
-	 */
-	private void createTree(Composite container, FormToolkit toolkit) {
-		TreePart treePart = getTreePart();
-		createViewerPartControl(container, SWT.SINGLE, 2, toolkit);
-		fTreeViewer = treePart.getTreeViewer();
-		fTreeViewer.setContentProvider(new CompCSContentProvider());
-		fTreeViewer.setLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-		PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().connect(this);
-		createTreeListeners();
-		// TODO: MP: LOW: CompCS: Implement drag and drop move feature
-	}
-
-	/**
-	 * 
-	 */
-	private void createTreeListeners() {
-		// Create listener for the outline view 'link with editor' toggle 
-		// button
-		fTreeViewer.addPostSelectionChangedListener(getPage().getPDEEditor().new PDEFormEditorChangeListener());
-	}
-
-	/**
-	 * @return
-	 */
-	public ISelection getSelection() {
-		return fTreeViewer.getSelection();
-	}
-
-	/**
-	 * 
-	 */
-	private void initializeTreeViewer() {
-
-		if (fModel == null) {
-			return;
-		}
-		fTreeViewer.setInput(fModel);
-		ICompCS cheatsheet = fModel.getCompCS();
-
-		// Create the group validator and register all existing groups to be
-		// validated within the workspace model
-		fGroupValidator = new CompCSGroupValidator(cheatsheet, getManagedForm().getForm().getForm(), Messages.CompCSMasterTreeSection_content);
-
-		// If the cheat sheet already has a task object, then the object has
-		// to be deleted first before a new task or group can be added to
-		// the root cheatsheet node
-		boolean addFlag = false;
-		if (cheatsheet.getFieldTaskObject() == null) {
-			addFlag = fModel.isEditable();
-		}
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_TASK, addFlag);
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_GROUP, addFlag);
-
-		// Set to false because initial node selected is the root cheatsheet node
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, false);
-		// Set to false because initial node selected is the root cheatsheet node
-		getTreePart().setButtonEnabled(F_BUTTON_UP, false);
-		// Set to false because initial node selected is the root cheatsheet node
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, false);
-
-		// Validate initial file content
-		// TODO: MP: LOW: CompCS: The error message does not show up in the form on load for some reason
-		// TODO: MP: LOW: CompCS: Implement error image overlay on icon ILightWeightLabelDecorator
-		// TODO: MP: LOW: CompCS: The error message dissapears on up / down movement
-		updatePreviewButton(fGroupValidator.validate());
-
-		// Select the cheatsheet node in the tree
-		fTreeViewer.setSelection(new StructuredSelection(cheatsheet), true);
-		fTreeViewer.expandToLevel(2);
-	}
-
-	/**
-	 * @param section
-	 * @param toolkit
-	 */
-	private void createSectionToolbar(Section section, FormToolkit toolkit) {
-
-		ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
-		ToolBar toolbar = toolBarManager.createControl(section);
-		final Cursor handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
-		toolbar.setCursor(handCursor);
-		// Cursor needs to be explicitly disposed
-		toolbar.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if ((handCursor != null) && (handCursor.isDisposed() == false)) {
-					handCursor.dispose();
-				}
-			}
-		});
-		// Add collapse action to the tool bar
-		fCollapseAction = new CollapseAction(fTreeViewer, Messages.CompCSMasterTreeSection_collapseAll, 1, fModel.getCompCS());
-		toolBarManager.add(fCollapseAction);
-
-		toolBarManager.update(true);
-
-		section.setTextClient(toolbar);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#buttonSelected(int)
-	 */
-	protected void buttonSelected(int index) {
-		switch (index) {
-			case F_BUTTON_ADD_TASK :
-				handleAddTaskAction();
-				break;
-			case F_BUTTON_ADD_GROUP :
-				handleAddGroupAction();
-				break;
-			case F_BUTTON_REMOVE :
-				handleDeleteAction();
-				break;
-			case F_BUTTON_UP :
-				handleMoveTaskObjectAction(F_UP_FLAG);
-				break;
-			case F_BUTTON_DOWN :
-				handleMoveTaskObjectAction(F_DOWN_FLAG);
-				break;
-			case F_BUTTON_PREVIEW :
-				handlePreviewAction();
-				break;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void selectionChanged(IStructuredSelection selection) {
-		updateButtons();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.details.ISimpleCSMaster#updateButtons()
-	 */
-	public void updateButtons() {
-		if (!fModel.isEditable()) {
-			return;
-		}
-		Object object = ((IStructuredSelection) fTreeViewer.getSelection()).getFirstElement();
-		ICompCSObject csObject = (ICompCSObject) object;
-		boolean canAddTask = false;
-		boolean canAddGroup = false;
-		boolean canRemove = false;
-		boolean canMoveUp = false;
-		boolean canMoveDown = false;
-
-		if (csObject != null) {
-			ICompCSObject parent = csObject.getParent();
-			if ((csObject.getType() == ICompCSConstants.TYPE_TASK) || (csObject.getType() == ICompCSConstants.TYPE_TASKGROUP)) {
-
-				if ((parent.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) && (csObject.getType() == ICompCSConstants.TYPE_TASKGROUP)) {
-					canAddTask = true;
-					canAddGroup = true;
-				} else if (parent.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-					ICompCSTaskGroup taskGroup = (ICompCSTaskGroup) parent;
-					ICompCSTaskObject taskObject = (ICompCSTaskObject) csObject;
-					if (taskGroup.isFirstFieldTaskObject(taskObject) == false) {
-						canMoveUp = true;
-					}
-					if (taskGroup.isLastFieldTaskObject(taskObject) == false) {
-						canMoveDown = true;
-					}
-					canRemove = canRemoveTaskObject(taskGroup);
-					canAddTask = true;
-					canAddGroup = true;
-				}
-			}
-		}
-
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_TASK, canAddTask);
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_GROUP, canAddGroup);
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, canRemove);
-		getTreePart().setButtonEnabled(F_BUTTON_UP, canMoveUp);
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, canMoveDown);
-	}
-
-	/**
-	 * 
-	 */
-	private void handleAddTaskAction() {
-
-		ISelection sel = fTreeViewer.getSelection();
-		Object object = ((IStructuredSelection) sel).getFirstElement();
-		if (object == null) {
-			return;
-		}
-		if (object instanceof ICompCSTaskGroup) {
-			fAddTaskAction.setParentObject((ICompCSObject) object);
-			fAddTaskAction.run();
-		} else if (object instanceof ICompCSTask) {
-			fAddTaskAction.setParentObject(((ICompCSObject) object).getParent());
-			fAddTaskAction.run();
-		}
-	}
-
-	/**
-	 * @param flag
-	 */
-	private void updatePreviewButton(boolean flag) {
-		getTreePart().setButtonEnabled(F_BUTTON_PREVIEW, flag);
-	}
-
-	/**
-	 * 
-	 */
-	private void handleAddGroupAction() {
-
-		ISelection sel = fTreeViewer.getSelection();
-		Object object = ((IStructuredSelection) sel).getFirstElement();
-		if (object == null) {
-			return;
-		}
-		if (object instanceof ICompCSTaskGroup) {
-			fAddGroupAction.setParentObject((ICompCSObject) object);
-			fAddGroupAction.run();
-		} else if (object instanceof ICompCSTask) {
-			fAddGroupAction.setParentObject(((ICompCSObject) object).getParent());
-			fAddGroupAction.run();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void handleMoveTaskObjectAction(int positionFlag) {
-
-		ISelection sel = fTreeViewer.getSelection();
-		Object object = ((IStructuredSelection) sel).getFirstElement();
-		if (object == null) {
-			return;
-		} else if (object instanceof ICompCSTaskObject) {
-			ICompCSTaskObject taskObject = (ICompCSTaskObject) object;
-			ICompCSTaskGroup parent = null;
-			// Determine the parents type
-			if (taskObject.getParent().getType() == ICompCSConstants.TYPE_TASKGROUP) {
-				parent = (ICompCSTaskGroup) taskObject.getParent();
-			} else {
-				return;
-			}
-			// Move the task object up or down one position
-			parent.moveFieldTaskObject(taskObject, positionFlag);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void handlePreviewAction() {
-		// Get the editor input
-		// Could be IFileEditorInput (File in workpspace - e.g. Package Explorer View)
-		// Could be IStorageEditorInput (File not in workpsace - e.g. CVS Repositories View)
-		IEditorInput input = getPage().getEditorInput();
-		URL url = null;
-		try {
-			if (input instanceof IFileEditorInput) {
-				IFileEditorInput fileInput = (IFileEditorInput) input;
-				url = fileInput.getFile().getLocationURI().toURL();
-			} else if (input instanceof IStorageEditorInput) {
-				// Note:  This URL does not exist on the local file system
-				// As a result any tasks this composite cheat sheet has that 
-				// specify a pathes to simple cheat sheets will not resolve
-				// Cheat sheet view will log an error loading simple cheat
-				// sheets
-				IStorageEditorInput storageInput = (IStorageEditorInput) input;
-				url = storageInput.getStorage().getFullPath().toFile().toURI().toURL();
-			} else {
-				// No base URL.  Pathes will definitely not resolve here 
-				url = null;
-			}
-
-			// Write the current model into a String as raw XML
-			StringWriter swriter = new StringWriter();
-			PrintWriter writer = new PrintWriter(swriter);
-			fModel.getCompCS().write("", writer); //$NON-NLS-1$
-			writer.flush();
-			swriter.close();
-			// Launch in the cheat sheet view
-			OpenCheatSheetAction openAction = new OpenCheatSheetAction(input.getName(), input.getName(), swriter.toString(), url);
-			openAction.run();
-		} catch (IOException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		} catch (CoreException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// No need to call super, world changed event handled here
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			handleModelEventWorldChanged(event);
-		} else if (event.getChangeType() == IModelChangedEvent.INSERT) {
-			handleModelInsertType(event);
-		} else if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-			handleModelRemoveType(event);
-		} else if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			handleModelChangeType(event);
-		}
-
-		// Validate registered groups regardless of change type
-		// Validation is not required for task and composite cheat sheet 
-		// change types (performance savings available); but, is required for
-		// everything else
-		updatePreviewButton(fGroupValidator.validate());
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelEventWorldChanged(IModelChangedEvent event) {
-
-		Object[] objects = event.getChangedObjects();
-		ICompCSObject object = (ICompCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-			return;
-		} else if (object.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			// Get the form page
-			CompCSPage page = (CompCSPage) getPage();
-			// Remember the currently selected page
-			IDetailsPage previousDetailsPage = page.getBlock().getDetailsPart().getCurrentPage();
-			// Replace the current dirty model with the model reloaded from
-			// file
-			fModel = ((ICompCS) object).getModel();
-			// Reset the treeviewer using the new model as input
-			// TODO: MP: CompCS:  This is redundant and should be deleted
-			fTreeViewer.setInput(fModel);
-			// Re-initialize the tree viewer.  Makes a details page selection
-			initializeTreeViewer();
-			// Get the current details page selection
-			IDetailsPage currentDetailsPage = page.getBlock().getDetailsPart().getCurrentPage();
-			// If the selected page before the revert is the same as the 
-			// selected page after the revert, then its fields will need to
-			// be updated
-			// TODO: MP: REVERT: LOW: Revisit to see if updating details page is necessary - especially after making static
-			if (currentDetailsPage.equals(previousDetailsPage) && currentDetailsPage instanceof ICSDetails) {
-				((ICSDetails) currentDetailsPage).updateFields();
-			}
-		}
-
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelInsertType(IModelChangedEvent event) {
-		// Insert event
-		Object[] objects = event.getChangedObjects();
-		ICompCSObject object = (ICompCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-		} else if (object.getType() == ICompCSConstants.TYPE_TASK) {
-			handleTaskObjectInsert(object);
-		} else if (object.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			handleTaskObjectInsert(object);
-			// Register the group for validation
-			fGroupValidator.addGroup((ICompCSTaskGroup) object);
-		}
-	}
-
-	/**
-	 * @param object
-	 */
-	private void handleTaskObjectInsert(ICompCSObject object) {
-		// Refresh the parent element in the tree viewer
-		// TODO: MP: CompCS: LOW: Can we get away with an update instead of a refresh here?
-		fTreeViewer.refresh(object.getParent());
-		// Select the new task / group in the tree
-		fTreeViewer.setSelection(new StructuredSelection(object), true);
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelRemoveType(IModelChangedEvent event) {
-		// Remove event
-		Object[] objects = event.getChangedObjects();
-		ICompCSObject object = (ICompCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-		} else if (object.getType() == ICompCSConstants.TYPE_TASK) {
-			handleTaskObjectRemove(object);
-		} else if (object.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			handleTaskObjectRemove(object);
-			// Unregister the group from validation
-			fGroupValidator.removeGroup((ICompCSTaskGroup) object);
-		}
-	}
-
-	/**
-	 * @param object
-	 */
-	private void handleTaskObjectRemove(ICompCSObject object) {
-		// Remove the item
-		fTreeViewer.remove(object);
-		// Select the appropriate object
-		ICompCSObject csObject = fRemoveTaskObjectAction.getObjectToSelect();
-		if (csObject == null) {
-			csObject = object.getParent();
-		}
-		fTreeViewer.setSelection(new StructuredSelection(csObject), true);
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelChangeType(IModelChangedEvent event) {
-		// Change event
-		Object[] objects = event.getChangedObjects();
-		ICompCSObject object = (ICompCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-		} else if (object.getType() == ICompCSConstants.TYPE_TASK) {
-			// Update the element in the tree viewer
-			fTreeViewer.update(object, null);
-		} else if (object.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			// Refresh the element in the tree viewer
-			fTreeViewer.update(object, null);
-		} else if (object.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			// Refresh the element in the tree viewer
-			fTreeViewer.update(object, null);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.ICSMaster#fireSelection()
-	 */
-	public void fireSelection() {
-		fTreeViewer.setSelection(fTreeViewer.getSelection());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		// Get the current selection
-		ISelection selection = fTreeViewer.getSelection();
-		Object object = ((IStructuredSelection) selection).getFirstElement();
-		// Do blind cast - has to be a composite CS object
-		// Could be null
-		ICompCSObject csObject = (ICompCSObject) object;
-		// Create the "New" sub-menu
-		MenuManager submenu = new MenuManager(Messages.CompCSMasterTreeSection_new);
-		// Add the "New" sub-menu to the main context menu
-		manager.add(submenu);
-		if ((csObject == null) || (csObject.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET)) {
-			// NO-OP
-		} else if (csObject.getType() == ICompCSConstants.TYPE_TASK) {
-			// Remove task action
-			fillContextMenuRemoveAction(manager, (ICompCSTaskObject) csObject);
-		} else if (csObject.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			ICompCSTaskGroup group = (ICompCSTaskGroup) csObject;
-			// Add to the "New" sub-menu
-			// Add task action
-			fAddTaskAction.setParentObject(group);
-			fAddTaskAction.setEnabled(fModel.isEditable());
-			submenu.add(fAddTaskAction);
-			// Add to the "New" sub-menu
-			// Add group action
-			fAddGroupAction.setParentObject(group);
-			fAddGroupAction.setEnabled(fModel.isEditable());
-			submenu.add(fAddGroupAction);
-			// Remove task group action
-			fillContextMenuRemoveAction(manager, (ICompCSTaskObject) csObject);
-		}
-		// Add normal edit operations
-		// TODO: MP: LOW: SimpleCS:  Enable context menu edit operations
-		//getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-		//manager.add(new Separator());
-	}
-
-	/**
-	 * @param manager
-	 * @param csObject
-	 */
-	private void fillContextMenuRemoveAction(IMenuManager manager, ICompCSTaskObject taskObject) {
-		// Add to the main context menu
-		// Add a separator to the main context menu
-		manager.add(new Separator());
-		// Delete task object action
-		fRemoveTaskObjectAction.setTaskObject(taskObject);
-		manager.add(fRemoveTaskObjectAction);
-		ICompCSObject parent = taskObject.getParent();
-		if (canRemoveTaskObject(parent) == false) {
-			fRemoveTaskObjectAction.setEnabled(false);
-		} else {
-			fRemoveTaskObjectAction.setEnabled(fModel.isEditable());
-		}
-	}
-
-	/* (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())) {
-			handleDeleteAction();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param object
-	 */
-	private void handleDeleteAction() {
-
-		ISelection sel = fTreeViewer.getSelection();
-		Object object = ((IStructuredSelection) sel).getFirstElement();
-		if (object != null) {
-			if (object instanceof ICompCSTaskObject) {
-				ICompCSTaskObject taskObject = (ICompCSTaskObject) object;
-				ICompCSObject parent = taskObject.getParent();
-				if (canRemoveTaskObject(parent) == false) {
-					// Preserve cheat sheet validity
-					// Semantic Rule:  Cannot have a task group with no tasks					
-					Display.getCurrent().beep();
-				} else {
-					fRemoveTaskObjectAction.setTaskObject(taskObject);
-					fRemoveTaskObjectAction.run();
-				}
-			} else if (object instanceof ICompCS) {
-				// Preserve cheat sheet validity
-				// Semantic Rule:  Cannot have a cheat sheet with no root
-				// cheatsheet node
-				// Produce audible beep
-				Display.getCurrent().beep();
-			}
-		}
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	private boolean canRemoveTaskObject(ICompCSObject parent) {
-		if (parent.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			// Preserve cheat sheet validity
-			// Semantic Rule: Cannot delete the task object directly under
-			// the root cheat sheet node
-			// Wizard by default creates a task group as the only allowed
-			// child of the root cheat sheet node. No good reason to
-			// substitute with a task instead. Specification supports its,
-			// but cheat sheet editor will not support it
-			return false;
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#setFormInput(java.lang.Object)
-	 */
-	public boolean setFormInput(Object object) {
-		// This method allows the outline view to select items in the tree
-		// Invoked by
-		// org.eclipse.ui.forms.editor.IFormPage.selectReveal(Object object)
-		if (object instanceof ICompCSObject) {
-			// Select the item in the tree
-			fTreeViewer.setSelection(new StructuredSelection(object), true);
-			// Verify that something was actually selected
-			ISelection selection = fTreeViewer.getSelection();
-			if ((selection != null) && (selection.isEmpty() == false)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java
deleted file mode 100755
index c56b986..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.core.AbstractModel;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock;
-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;
-
-/**
- * CompCSPage
- */
-public class CompCSPage extends PDEFormPage implements IModelChangedListener {
-
-	public static final String PAGE_ID = "compCSPage"; //$NON-NLS-1$
-
-	private CompCSBlock fBlock;
-
-	/**
-	 * @param editor
-	 */
-	public CompCSPage(FormEditor editor) {
-		super(editor, PAGE_ID, Messages.CompCSPage_definition);
-
-		fBlock = new CompCSBlock(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#getHelpResource()
-	 */
-	protected String getHelpResource() {
-		return IHelpContextIds.COMPOSITE_CS_EDITOR;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.
-	 * eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		// Bug: Two veritical scrollbars appear when resizing the editor
-		// vertically
-		// Note: Scrolled form #1 created here
-		ScrolledForm form = managedForm.getForm();
-		// Set page title
-		ICompCSModel model = (ICompCSModel) getModel();
-		// Ensure the model was loaded properly
-		if ((model == null) || (model.isLoaded() == false)) {
-			Exception e = null;
-			if (model instanceof AbstractModel) {
-				e = ((AbstractModel) model).getException();
-			}
-			// Create a formatted error page
-			createFormErrorContent(managedForm,
-					Messages.CompCSPage_loadFailure, Messages.CompCSPage_error,
-					e);
-			return;
-		}
-		// Create the rest of the actions in the form title area
-		super.createFormContent(managedForm);
-		// Form image
-		form.setImage(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider()
-				.get(PDEUserAssistanceUIPluginImages.DESC_CHEATSHEET_OBJ));
-		// Form title
-		String title = PDETextHelper.translateReadText(model.getCompCS()
-				.getFieldName());
-		if (title.length() > 0) {
-			form.setText(title);
-		} else {
-			form.setText(Messages.CompCSPage_definition);
-		}
-		// Create the masters details block
-		// Note: Scrolled form #2 created here
-		fBlock.createContent(managedForm);
-		// Force the selection in the masters tree section to load the
-		// proper details section
-		fBlock.getMastersSection().fireSelection();
-		// Register this page to be informed of model change events
-		model.addModelChangedListener(this);
-		// Set context-sensitive help
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(),
-				IHelpContextIds.COMPOSITE_CS_EDITOR);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#dispose()
-	 */
-	public void dispose() {
-
-		ICompCSModel compCSModel = (ICompCSModel) getModel();
-		if (compCSModel != null) {
-			compCSModel.removeModelChangedListener(this);
-		}
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde
-	 * .core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-
-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object[] objects = event.getChangedObjects();
-			ICompCSObject object = (ICompCSObject) objects[0];
-			if (object == null) {
-				// Ignore
-			} else if (object.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-				String changeProperty = event.getChangedProperty();
-				if ((changeProperty != null)
-						&& changeProperty
-								.equals(ICompCSConstants.ATTRIBUTE_NAME)) {
-					// Has to be a String if the property is a title
-					// Update the form page title
-					getManagedForm().getForm().setText(
-							PDETextHelper.translateReadText((String) event
-									.getNewValue()));
-				}
-			}
-		} else if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			handleModelEventWorldChanged(event);
-		}
-		// Inform the block
-		fBlock.modelChanged(event);
-	}
-
-	/**
-	 * @return
-	 */
-	public ISelection getSelection() {
-		return fBlock.getSelection();
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelEventWorldChanged(IModelChangedEvent event) {
-
-		Object[] objects = event.getChangedObjects();
-		ICompCSObject object = (ICompCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-			return;
-		} else if (object.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			String newValue = ((ICompCS) object).getFieldName();
-			// Update page title
-			getManagedForm().getForm().setText(
-					PDETextHelper.translateReadText(newValue));
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	public PDEMasterDetailsBlock getBlock() {
-		return fBlock;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/Messages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/Messages.java
deleted file mode 100644
index 277b809..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/Messages.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.messages"; //$NON-NLS-1$
-	public static String CompCSFileValidator_0;
-	public static String CompCSMasterTreeSection_addGroup;
-	public static String CompCSMasterTreeSection_addTask;
-	public static String CompCSMasterTreeSection_collapseAll;
-	public static String CompCSMasterTreeSection_content;
-	public static String CompCSMasterTreeSection_Content;
-	public static String CompCSMasterTreeSection_Down;
-	public static String CompCSMasterTreeSection_new;
-	public static String CompCSMasterTreeSection_Preview;
-	public static String CompCSMasterTreeSection_Remove;
-	public static String CompCSMasterTreeSection_sectionDesc;
-	public static String CompCSMasterTreeSection_Up;
-	public static String CompCSPage_definition;
-	public static String CompCSPage_error;
-	public static String CompCSPage_loadFailure;
-	public static String CompCSCreationOperation_conclusion;
-	public static String CompCSGroupValidator_errorChildlessGroup;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/ActionsMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/ActionsMessages.java
deleted file mode 100644
index 50a4b5e..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/ActionsMessages.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ActionsMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions.messages"; //$NON-NLS-1$
-	
-	public static String CompCSAddGroupAction_group;
-	public static String CompCSAddTaskAction_task;
-	public static String CompCSRemoveTaskObjectAction_delete;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, ActionsMessages.class);
-	}
-
-	private ActionsMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAbstractAddAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAbstractAddAction.java
deleted file mode 100755
index 7f31ba2..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAbstractAddAction.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-
-/**
- * SimpleCSAddStepAction
- *
- */
-public abstract class CompCSAbstractAddAction extends Action {
-
-	protected ICompCSObject fParentObject;
-
-	/**
-	 * 
-	 */
-	public CompCSAbstractAddAction() {
-		// NO-OP
-	}
-
-	/**
-	 * @param cheatsheet
-	 */
-	public void setParentObject(ICompCSObject object) {
-		fParentObject = object;
-	}
-
-	protected String[] getTaskObjectNames(ICompCSTaskGroup parent) {
-		ICompCSTaskObject[] taskObjects = parent.getFieldTaskObjects();
-		String[] taskObjectNames = new String[taskObjects.length];
-		for (int i = 0; i < taskObjects.length; ++i) {
-			taskObjectNames[i] = taskObjects[i].getFieldName();
-		}
-
-		return taskObjectNames;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddGroupAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddGroupAction.java
deleted file mode 100755
index 6c770f7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddGroupAction.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.CompCSCreationOperation;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-
-/**
- * CompCSAddTaskAction
- *
- */
-public class CompCSAddGroupAction extends CompCSAbstractAddAction {
-
-	/**
-	 * 
-	 */
-	public CompCSAddGroupAction() {
-		setText(ActionsMessages.CompCSAddGroupAction_group);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-
-		if (fParentObject == null) {
-			return;
-		}
-		ICompCSTaskGroup group = CompCSCreationOperation.createBasicGroup(fParentObject);
-		// Set on the proper parent object
-		if (fParentObject.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			ICompCSTaskGroup parent = (ICompCSTaskGroup) fParentObject;
-
-			String name = PDELabelUtility.generateName(getTaskObjectNames(parent), ActionsMessages.CompCSAddGroupAction_group);
-			group.setFieldName(name);
-			parent.addFieldTaskObject(group);
-		} else if (fParentObject.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			// Not supported by editor
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddTaskAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddTaskAction.java
deleted file mode 100755
index 54b4001..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddTaskAction.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.CompCSCreationOperation;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-
-/**
- * CompCSAddTaskAction
- *
- */
-public class CompCSAddTaskAction extends CompCSAbstractAddAction {
-
-	/**
-	 * 
-	 */
-	public CompCSAddTaskAction() {
-		setText(ActionsMessages.CompCSAddTaskAction_task);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-
-		if (fParentObject == null) {
-			return;
-		}
-		ICompCSTask task = CompCSCreationOperation.createBasicTask(fParentObject);
-		// Set on the proper parent object
-		if (fParentObject.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-			ICompCSTaskGroup parent = (ICompCSTaskGroup) fParentObject;
-
-			String name = PDELabelUtility.generateName(getTaskObjectNames(parent), ActionsMessages.CompCSAddTaskAction_task);
-			task.setFieldName(name);
-			parent.addFieldTaskObject(task);
-		} else if (fParentObject.getType() == ICompCSConstants.TYPE_COMPOSITE_CHEATSHEET) {
-			// Not supported by editor
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSRemoveTaskObjectAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSRemoveTaskObjectAction.java
deleted file mode 100755
index f9697f8..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSRemoveTaskObjectAction.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSObject;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-
-/**
- * SimpleCSAddStepAction
- */
-public class CompCSRemoveTaskObjectAction extends Action {
-
-	private ICompCSTaskObject fTaskObject;
-
-	private ICompCSObject fObjectToSelect;
-
-	/**
-	 * 
-	 */
-	public CompCSRemoveTaskObjectAction() {
-		setText(ActionsMessages.CompCSRemoveTaskObjectAction_delete);
-		fTaskObject = null;
-		fObjectToSelect = null;
-	}
-
-	/**
-	 * @param subitem
-	 */
-	public void setTaskObject(ICompCSTaskObject taskObject) {
-		fTaskObject = taskObject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fTaskObject != null) {
-			ICompCSObject parent = fTaskObject.getParent();
-			if (parent.getType() == ICompCSConstants.TYPE_TASKGROUP) {
-				// Parent is a group
-				ICompCSTaskGroup group = (ICompCSTaskGroup) parent;
-				// Determine the object to select after the deletion 
-				// takes place 
-				determineItemToSelect(group);
-				// Remove the subitem
-				group.removeFieldTaskObject(fTaskObject);
-			}
-		}
-	}
-
-	/**
-	 * @param item
-	 */
-	private void determineItemToSelect(ICompCSTaskGroup group) {
-		// Select the next sibling
-		fObjectToSelect = group.getNextSibling(fTaskObject);
-		if (fObjectToSelect == null) {
-			// No next sibling
-			// Select the previous sibling
-			fObjectToSelect = group.getPreviousSibling(fTaskObject);
-			if (fObjectToSelect == null) {
-				// No previous sibling
-				// Select the parent
-				fObjectToSelect = group;
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	public ICompCSObject getObjectToSelect() {
-		return fObjectToSelect;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/messages.properties
deleted file mode 100644
index 5de341f..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/messages.properties
+++ /dev/null

@@ -1,3 +0,0 @@
-CompCSAddGroupAction_group=Group
-CompCSAddTaskAction_task=Task
-CompCSRemoveTaskObjectAction_delete=&Delete

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSConclusionTextListener.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSConclusionTextListener.java
deleted file mode 100755
index 83da50c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSConclusionTextListener.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSOnCompletion;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-
-/**
- * CompCSEnclosingTextModifyListener
- *
- */
-public class CompCSConclusionTextListener implements IDocumentListener {
-
-	private ICompCSTaskObject fDataTaskObject;
-
-	private boolean fBlockEvents;
-
-	/**
-	 * 
-	 */
-	public CompCSConclusionTextListener() {
-		fDataTaskObject = null;
-		fBlockEvents = false;
-	}
-
-	/**
-	 * @param block
-	 */
-	public void setBlockEvents(boolean block) {
-		fBlockEvents = block;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean getBlockEvents() {
-		return fBlockEvents;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ICompCSTaskObject object) {
-		// Set data
-		fDataTaskObject = object;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentAboutToBeChanged(DocumentEvent e) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-	 */
-	public void documentChanged(DocumentEvent event) {
-		// Check whether to handle this event
-		if (fBlockEvents) {
-			return;
-		}
-		// Ensure the task object is defined
-		if (fDataTaskObject == null) {
-			return;
-		}
-		// Get the text from the event
-		IDocument document = event.getDocument();
-		if (document == null) {
-			return;
-		}
-		String text = document.get().trim();
-		// Determine whether a conclusion was specified
-		boolean hasText = PDETextHelper.isDefined(text);
-		if (hasText) {
-			// A conclusion was specified, update accordingly
-			updateConclusionText(text);
-		} else {
-			// No conclusion was specified, remove any existing one
-			removeConclusionText(text);
-		}
-	}
-
-	/**
-	 * @param text
-	 */
-	private void updateConclusionText(String text) {
-		if (fDataTaskObject.getFieldOnCompletion() == null) {
-			// Create a new conclusion
-			addConclusionText(text);
-		} else {
-			// Re-use the existing conclusion
-			modifyConclusionText(text);
-		}
-	}
-
-	/**
-	 * @param text
-	 */
-	private void addConclusionText(String text) {
-		ICompCSModelFactory factory = fDataTaskObject.getModel().getFactory();
-		ICompCSOnCompletion conclusion = factory.createCompCSOnCompletion(fDataTaskObject);
-		conclusion.setFieldContent(text);
-		fDataTaskObject.setFieldOnCompletion(conclusion);
-	}
-
-	/**
-	 * @param text
-	 */
-	private void modifyConclusionText(String text) {
-		ICompCSOnCompletion conclusion = fDataTaskObject.getFieldOnCompletion();
-		conclusion.setFieldContent(text);
-	}
-
-	/**
-	 * @param text
-	 */
-	private void removeConclusionText(String text) {
-		ICompCSOnCompletion conclusion = fDataTaskObject.getFieldOnCompletion();
-		if (conclusion != null) {
-			fDataTaskObject.setFieldOnCompletion(null);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSDetails.java
deleted file mode 100755
index ed0a6e7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSDetails.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCS;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.CompCSInputContext;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * CompCSDetails
- *
- */
-public class CompCSDetails extends CSAbstractDetails {
-
-	private ICompCS fDataCheatSheet;
-
-	private Section fMainSection;
-
-	private FormEntry fNameEntry;
-
-	/**
-	 * @param masterSection
-	 */
-	public CompCSDetails(ICSMaster masterSection) {
-		super(masterSection, CompCSInputContext.CONTEXT_ID);
-		fDataCheatSheet = null;
-
-		fNameEntry = null;
-		fMainSection = null;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ICompCS object) {
-		// Set data
-		fDataCheatSheet = object;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-		// Create the main section
-		int style = Section.DESCRIPTION | ExpandableComposite.TITLE_BAR;
-		fMainSection = getPage().createUISection(parent, DetailsMessages.CompCSDetails_sectionTitle, DetailsMessages.CompCSDetails_sectionDescription, style);
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fMainSection);
-		// Create the container for the main section
-		Composite sectionClient = getPage().createUISectionContainer(fMainSection, 2);
-		// Create the name widget
-		createUINameEntry(sectionClient);
-		// Bind widgets
-		getManagedForm().getToolkit().paintBordersFor(sectionClient);
-		fMainSection.setClient(sectionClient);
-		markDetailsPart(fMainSection);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUINameEntry(Composite parent) {
-		fNameEntry = new FormEntry(parent, getManagedForm().getToolkit(), DetailsMessages.CompCSDetails_name, SWT.NONE);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// Create the listeners for the name entry
-		createListenersNameEntry();
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersNameEntry() {
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataCheatSheet == null) {
-					return;
-				}
-				fDataCheatSheet.setFieldName(fNameEntry.getValue());
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataCheatSheet == null) {
-			return;
-		}
-		// Update name entry
-		updateNameEntry(isEditableElement());
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateNameEntry(boolean editable) {
-		fNameEntry.setValue(fDataCheatSheet.getFieldName(), true);
-		fNameEntry.setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fNameEntry.commit();
-		// No need to call for sub details, because they contain no form entries
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if ((object == null) || (object instanceof ICompCS) == false) {
-			return;
-		}
-		// Set data
-		setData((ICompCS) object);
-		// Update the UI given the new data
-		updateFields();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java
deleted file mode 100755
index ef43008..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java
+++ /dev/null

@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSIntro;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSOnCompletion;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractSubDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.CompCSInputContext;
-import org.eclipse.pde.internal.ui.parts.PDESourceViewer;
-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.dnd.Clipboard;
-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.ui.forms.FormColors;
-import org.eclipse.ui.forms.IFormColors;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * CompCSEnclosingTextDetails
- *
- */
-public class CompCSEnclosingTextDetails extends CSAbstractSubDetails {
-
-	private ICompCSTaskObject fDataTaskObject;
-
-	private Section fEnclosingTextSection;
-
-	private PDESourceViewer fIntroductionViewer;
-
-	private PDESourceViewer fConclusionViewer;
-
-	private CTabFolder fTabFolder;
-
-	private final static int F_INTRODUCTION_TAB = 0;
-
-	private final static int F_CONCLUSION_TAB = 1;
-
-	private final static int F_NO_TAB = -1;
-
-	private Composite fNotebookComposite;
-
-	private StackLayout fNotebookLayout;
-
-	private Composite fIntroductionComposite;
-
-	private Composite fConclusionComposite;
-
-	private String fTaskObjectLabelName;
-
-	private CompCSIntroductionTextListener fIntroductionListener;
-
-	private CompCSConclusionTextListener fConclusionListener;
-
-	/**
-	 * 
-	 */
-	public CompCSEnclosingTextDetails(int type, ICSMaster section) {
-		super(section, CompCSInputContext.CONTEXT_ID);
-
-		fDataTaskObject = null;
-
-		fEnclosingTextSection = null;
-
-		fIntroductionViewer = null;
-		fConclusionViewer = null;
-
-		fTabFolder = null;
-		fNotebookComposite = null;
-		fNotebookLayout = null;
-
-		fIntroductionComposite = null;
-		fConclusionComposite = null;
-
-		fIntroductionListener = new CompCSIntroductionTextListener();
-		fConclusionListener = new CompCSConclusionTextListener();
-
-		defineTaskObjectLabelName(type);
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ICompCSTaskObject object) {
-		// Set data
-		fDataTaskObject = object;
-		// Set data on introduction text listener
-		fIntroductionListener.setData(object);
-		// Set data on conclusion text listener
-		fConclusionListener.setData(object);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-	}
-
-	/**
-	 * 
-	 */
-	private void defineTaskObjectLabelName(int type) {
-		if (type == ICompCSConstants.TYPE_TASK) {
-			fTaskObjectLabelName = DetailsMessages.CompCSEnclosingTextDetails_task;
-		} else {
-			fTaskObjectLabelName = DetailsMessages.CompCSEnclosingTextDetails_group;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.ICSDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-		// Create the main section
-		int style = Section.DESCRIPTION | ExpandableComposite.TITLE_BAR;
-		String description = NLS.bind(DetailsMessages.CompCSEnclosingTextDetails_description, fTaskObjectLabelName);
-		fEnclosingTextSection = getPage().createUISection(parent, DetailsMessages.CompCSEnclosingTextDetails_enclosing, description, style);
-		// Configure the section
-		// The source viewers get clipped when the label above it wraps.
-		// Prevent this by making the section fill vertically in addition to
-		// horizontally
-		GridData data = new GridData(GridData.FILL_BOTH);
-		fEnclosingTextSection.setLayoutData(data);
-		// Create the container for the main section
-		Composite sectionClient = getPage().createUISectionContainer(fEnclosingTextSection, 1);
-		// Create the tab folder
-		createUITabFolder(sectionClient);
-		// Create the introduction folder tab
-		createUIIntroductionTab();
-		// Create the conclusion folder tab
-		createUIConclusionTab();
-		// Create the notebook composite
-		createUINotebookComposite(sectionClient);
-		// Create the introduction text
-		createUIIntroductionViewer();
-		// Create the conclusion text
-		createUIConclusionViewer();
-		// Bind widgets
-		getToolkit().paintBordersFor(sectionClient);
-		fEnclosingTextSection.setClient(sectionClient);
-		// Mark as a details part to enable cut, copy, paste, etc.		
-		markDetailsPart(fEnclosingTextSection);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUITabFolder(Composite parent) {
-		fTabFolder = new CTabFolder(parent, SWT.FLAT | SWT.TOP);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.heightHint = 2;
-		fTabFolder.setLayoutData(data);
-
-		getToolkit().adapt(fTabFolder, true, true);
-
-		FormColors colors = getToolkit().getColors();
-		colors.initializeSectionToolBarColors();
-		Color selectedColor = colors.getColor(IFormColors.TB_BG);
-		fTabFolder.setSelectionBackground(new Color[] {selectedColor, colors.getBackground()}, new int[] {100}, true);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIIntroductionTab() {
-		CTabItem item = new CTabItem(fTabFolder, SWT.NULL);
-		item.setText(DetailsMessages.CompCSEnclosingTextDetails_introduction);
-		item.setImage(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().get(PDEUserAssistanceUIPluginImages.DESC_CSINTRO_OBJ));
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIConclusionTab() {
-		CTabItem item = new CTabItem(fTabFolder, SWT.NULL);
-		item.setText(DetailsMessages.CompCSEnclosingTextDetails_conclusion);
-		item.setImage(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().get(PDEUserAssistanceUIPluginImages.DESC_CSCONCLUSION_OBJ));
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUINotebookComposite(Composite parent) {
-		fNotebookComposite = getToolkit().createComposite(parent);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		fNotebookComposite.setLayoutData(data);
-		fNotebookLayout = new StackLayout();
-		fNotebookComposite.setLayout(fNotebookLayout);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIIntroductionViewer() {
-		// Create composite
-		fIntroductionComposite = createUIContainer(fNotebookComposite, 1);
-		// Create label
-		String description = NLS.bind(DetailsMessages.CompCSEnclosingTextDetails_label, fTaskObjectLabelName);
-		final Label label = getToolkit().createLabel(fIntroductionComposite, description, SWT.WRAP);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		label.setLayoutData(data);
-		// Create the source viewer
-		fIntroductionViewer = new PDESourceViewer(getPage());
-		fIntroductionViewer.createUI(fIntroductionComposite, 60, 60);
-		// Note: Must paint border for parent composite; otherwise, the border
-		// goes missing on the text widget when using the Windows XP Classic
-		// theme
-		getToolkit().paintBordersFor(fIntroductionComposite);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEDetails#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		// Determine which tab is selected
-		int index = fTabFolder.getSelectionIndex();
-		// Do the global action on the source viewer on that tab
-		PDESourceViewer viewer = null;
-
-		if (index == F_INTRODUCTION_TAB) {
-			viewer = fIntroductionViewer;
-		} else if (index == F_CONCLUSION_TAB) {
-			viewer = fConclusionViewer;
-		}
-
-		return viewer.doGlobalAction(actionId);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIConclusionViewer() {
-		// Create composite
-		fConclusionComposite = createUIContainer(fNotebookComposite, 1);
-		// Create label
-		String description = NLS.bind(DetailsMessages.CompCSEnclosingTextDetails_labelDescription, fTaskObjectLabelName);
-		final Label label = getToolkit().createLabel(fConclusionComposite, description, SWT.WRAP);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		label.setLayoutData(data);
-		// Create the source viewer
-		fConclusionViewer = new PDESourceViewer(getPage());
-		fConclusionViewer.createUI(fConclusionComposite, 60, 60);
-		// Note: Must paint border for parent composite; otherwise, the border
-		// goes missing on the text widget when using the Windows XP Classic
-		// theme
-		getToolkit().paintBordersFor(fConclusionComposite);
-	}
-
-	/**
-	 * @param parent
-	 * @param columns
-	 * @return
-	 */
-	private Composite createUIContainer(Composite parent, int columns) {
-		Composite container = getToolkit().createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 2;
-		layout.marginHeight = 2;
-		layout.numColumns = columns;
-		container.setLayout(layout);
-		return container;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.ICSDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// Create the listeners for the introduction text
-		createListenersIntroductionViewer();
-		// Create the listeners for the conclusion text
-		createListenersConclusionViewer();
-		// Create the listeners for the tab folder
-		createListenersTabFolder();
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersIntroductionViewer() {
-		fIntroductionViewer.createUIListeners();
-		// Create document listener
-		fIntroductionViewer.getDocument().addDocumentListener(fIntroductionListener);
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersConclusionViewer() {
-		fConclusionViewer.createUIListeners();
-		// Create document listener
-		fConclusionViewer.getDocument().addDocumentListener(fConclusionListener);
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersTabFolder() {
-		fTabFolder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateTabFolder();
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void updateTabFolder() {
-
-		int index = fTabFolder.getSelectionIndex();
-		Control oldControl = fNotebookLayout.topControl;
-
-		if (index == F_NO_TAB) {
-			// Select the introduction contents by default
-			fNotebookLayout.topControl = fIntroductionComposite;
-			// Select the introduction tab by default to match
-			// Does not trigger selection adapter (only user UI selections do)
-			fTabFolder.setSelection(F_INTRODUCTION_TAB);
-		} else if (index == F_INTRODUCTION_TAB) {
-			fNotebookLayout.topControl = fIntroductionComposite;
-		} else if (index == F_CONCLUSION_TAB) {
-			fNotebookLayout.topControl = fConclusionComposite;
-		}
-
-		if (oldControl != fNotebookLayout.topControl) {
-			fNotebookComposite.layout();
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.ICSDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataTaskObject == null) {
-			return;
-		}
-		boolean editable = isEditableElement();
-		// Update tab folder
-		updateTabFolder();
-		// Update introduction text
-		updateIntroductionViewer(editable);
-		// Update conclusion text
-		updateConclusionViewer(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateIntroductionViewer(boolean editable) {
-		ICompCSIntro intro = fDataTaskObject.getFieldIntro();
-
-		// Block listener from handling this update
-		fIntroductionListener.setBlockEvents(true);
-		if ((intro != null) && PDETextHelper.isDefined(intro.getFieldContent())) {
-			fIntroductionViewer.getDocument().set(intro.getFieldContent());
-		} else {
-			fIntroductionViewer.getDocument().set(""); //$NON-NLS-1$
-		}
-		// Unblock for user updates
-		fIntroductionListener.setBlockEvents(false);
-
-		fIntroductionViewer.getViewer().setEditable(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateConclusionViewer(boolean editable) {
-		ICompCSOnCompletion conclusion = fDataTaskObject.getFieldOnCompletion();
-
-		// Block listener from handling this update
-		fConclusionListener.setBlockEvents(true);
-		if ((conclusion != null) && PDETextHelper.isDefined(conclusion.getFieldContent())) {
-			fConclusionViewer.getDocument().set(conclusion.getFieldContent());
-		} else {
-			fConclusionViewer.getDocument().set(""); //$NON-NLS-1$
-		}
-		// Unblock for user updates
-		fConclusionListener.setBlockEvents(false);
-
-		fConclusionViewer.getViewer().setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		// Set the context menu to null to prevent the editor context menu
-		// from being disposed along with the source viewer
-		if (fIntroductionViewer != null) {
-			fIntroductionViewer.unsetMenu();
-			fIntroductionViewer = null;
-		}
-		if (fConclusionViewer != null) {
-			fConclusionViewer.unsetMenu();
-			fConclusionViewer = null;
-		}
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEDetails#canPaste(org.eclipse.swt.dnd.Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		// Determine which tab is selected
-		int index = fTabFolder.getSelectionIndex();
-		// Check if the source viewer on that tab can paste
-		PDESourceViewer viewer = null;
-
-		if (index == F_INTRODUCTION_TAB) {
-			viewer = fIntroductionViewer;
-		} else if (index == F_CONCLUSION_TAB) {
-			viewer = fConclusionViewer;
-		}
-
-		return viewer.canPaste();
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSIntroductionTextListener.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSIntroductionTextListener.java
deleted file mode 100755
index 2db6885..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSIntroductionTextListener.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSIntro;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskObject;
-
-/**
- * CompCSEnclosingTextModifyListener
- */
-public class CompCSIntroductionTextListener implements IDocumentListener {
-
-	private ICompCSTaskObject fDataTaskObject;
-
-	private boolean fBlockEvents;
-
-	/**
-	 * 
-	 */
-	public CompCSIntroductionTextListener() {
-		fDataTaskObject = null;
-		fBlockEvents = false;
-	}
-
-	/**
-	 * @param block
-	 */
-	public void setBlockEvents(boolean block) {
-		fBlockEvents = block;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean getBlockEvents() {
-		return fBlockEvents;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ICompCSTaskObject object) {
-		// Set data
-		fDataTaskObject = object;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentAboutToBeChanged(DocumentEvent e) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-	 */
-	public void documentChanged(DocumentEvent event) {
-		// Check whether to handle this event
-		if (fBlockEvents) {
-			return;
-		}
-		// Ensure the task object is defined
-		if (fDataTaskObject == null) {
-			return;
-		}
-		// Get the text from the event
-		IDocument document = event.getDocument();
-		if (document == null) {
-			return;
-		}
-		String text = document.get().trim();
-		// Determine whether an introduction was specified
-		boolean hasText = PDETextHelper.isDefined(text);
-		if (hasText) {
-			// An introduction was specified, update accordingly
-			updateIntroductionText(text);
-		} else {
-			// No introduction was specified, remove any existing one
-			removeIntroductionText(text);
-		}
-	}
-
-	/**
-	 * @param text
-	 */
-	private void updateIntroductionText(String text) {
-		if (fDataTaskObject.getFieldIntro() == null) {
-			// Create a new introduction
-			addIntroductionText(text);
-		} else {
-			// Re-use the existing introduction
-			modifyIntroductionText(text);
-		}
-	}
-
-	/**
-	 * @param text
-	 */
-	private void addIntroductionText(String text) {
-		ICompCSModelFactory factory = fDataTaskObject.getModel().getFactory();
-		ICompCSIntro intro = factory.createCompCSIntro(fDataTaskObject);
-		intro.setFieldContent(text);
-		fDataTaskObject.setFieldIntro(intro);
-	}
-
-	/**
-	 * @param text
-	 */
-	private void modifyIntroductionText(String text) {
-		ICompCSIntro intro = fDataTaskObject.getFieldIntro();
-		intro.setFieldContent(text);
-	}
-
-	/**
-	 * @param text
-	 */
-	private void removeIntroductionText(String text) {
-		ICompCSIntro intro = fDataTaskObject.getFieldIntro();
-		if (intro != null) {
-			fDataTaskObject.setFieldIntro(null);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskDetails.java
deleted file mode 100755
index e41b257..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskDetails.java
+++ /dev/null

@@ -1,583 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;
-
-import java.util.StringTokenizer;
-
-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.Path;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModelFactory;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSParam;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTask;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.CompCSFileValidator;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.CompCSInputContext;
-import org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.NewSimpleCSFileWizard;
-import org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.SimpleCSFileWizardPage;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.FileExtensionFilter;
-import org.eclipse.swt.SWT;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.forms.IFormColors;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * CompCSTaskDetails
- *
- */
-public class CompCSTaskDetails extends CSAbstractDetails {
-
-	private Section fDefinitionSection;
-
-	private FormEntry fNameEntry;
-
-	private FormEntry fPathEntry;
-
-	private Button fSkip;
-
-	private ICompCSTask fDataTask;
-
-	private CompCSEnclosingTextDetails fEnclosingTextSection;
-
-	private final static String F_PATH_SEPARATOR = "/"; //$NON-NLS-1$
-
-	private final static String F_DOT_DOT = ".."; //$NON-NLS-1$
-
-	/**
-	 * @param section
-	 */
-	public CompCSTaskDetails(ICSMaster section) {
-		super(section, CompCSInputContext.CONTEXT_ID);
-		fDataTask = null;
-
-		fNameEntry = null;
-		fPathEntry = null;
-		fSkip = null;
-
-		fDefinitionSection = null;
-		fEnclosingTextSection = new CompCSEnclosingTextDetails(ICompCSConstants.TYPE_TASK, section);
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ICompCSTask object) {
-		// Set data
-		fDataTask = object;
-		// Set data on the enclosing text section
-		fEnclosingTextSection.setData(object);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		super.initialize(form);
-		// Unfortunately this has to be explicitly called for sub detail
-		// sections through its main section parent; since, it never is 
-		// registered directly.
-		// Initialize managed form for enclosing text section
-		fEnclosingTextSection.initialize(form);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		// Create the main section
-		int style = Section.DESCRIPTION | ExpandableComposite.TITLE_BAR;
-		fDefinitionSection = getPage().createUISection(parent, DetailsMessages.CompCSTaskDetails_title, DetailsMessages.CompCSTaskDetails_description, style);
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fDefinitionSection);
-		// Create the container for the main section
-		Composite sectionClient = getPage().createUISectionContainer(fDefinitionSection, 3);
-		// Create the name entry
-		createUINameEntry(sectionClient);
-		// Create the kind combo
-		createUIPathEntry(sectionClient);
-		// Create the skip button
-		createUISkipButton(sectionClient);
-		// Create the enclosing text section
-		fEnclosingTextSection.createDetails(parent);
-		// Bind widgets
-		getManagedForm().getToolkit().paintBordersFor(sectionClient);
-		fDefinitionSection.setClient(sectionClient);
-		markDetailsPart(fDefinitionSection);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUINameEntry(Composite parent) {
-		fNameEntry = new FormEntry(parent, getManagedForm().getToolkit(), DetailsMessages.CompCSTaskDetails_name, SWT.NONE);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIPathEntry(Composite parent) {
-		fPathEntry = new FormEntry(parent, getManagedForm().getToolkit(), DetailsMessages.CompCSTaskDetails_path, DetailsMessages.CompCSTaskDetails_browse, isEditable());
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUISkipButton(Composite parent) {
-		Color foreground = getToolkit().getColors().getColor(IFormColors.TITLE);
-		fSkip = getToolkit().createButton(parent, DetailsMessages.CompCSTaskDetails_optional, SWT.CHECK);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		fSkip.setLayoutData(data);
-		fSkip.setForeground(foreground);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// Create listeners for the name entry
-		createListenersNameEntry();
-		// Create listeners for the path entry
-		createListenersPathEntry();
-		// Create listeners for the skip button
-		createListenersSkipButton();
-		// Create listeners within the enclosing text section
-		fEnclosingTextSection.hookListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersNameEntry() {
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTask == null) {
-					return;
-				}
-				fDataTask.setFieldName(fNameEntry.getValue());
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersPathEntry() {
-		fPathEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void browseButtonSelected(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTask == null) {
-					return;
-				}
-				handleButtonEventPathEntry(entry);
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				// Ensure data object is defined
-				if (fDataTask == null) {
-					return;
-				}
-				handleLinkEventPathEntry(convertPathRelativeToAbs(fPathEntry.getValue(), fDataTask.getModel().getUnderlyingResource().getFullPath().toPortableString()));
-			}
-
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTask == null) {
-					return;
-				}
-				// TODO: MP: LOW: CompCS: Could validate manual input
-				handleTextEventPathEntry(entry.getValue());
-			}
-		});
-	}
-
-	/**
-	 * @param entry
-	 */
-	private void handleButtonEventPathEntry(FormEntry entry) {
-		// Create the dialog
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getManagedForm().getForm().getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
-		dialog.setValidator(new CompCSFileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(DetailsMessages.CompCSTaskDetails_wizardTitle);
-		dialog.setMessage(DetailsMessages.CompCSTaskDetails_wizardDescription);
-		dialog.addFilter(new FileExtensionFilter("xml")); //$NON-NLS-1$
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot().getProject(fDataTask.getModel().getUnderlyingResource().getProject().getName()));
-
-		if (dialog.open() == Window.OK) {
-			IFile file = (IFile) dialog.getFirstResult();
-			String newValue = convertPathAbsToRelative(file.getFullPath().toPortableString(), fDataTask.getModel().getUnderlyingResource().getFullPath().toPortableString());
-			entry.setValue(newValue);
-			handleTextEventPathEntry(newValue);
-		}
-	}
-
-	/**
-	 * @param path
-	 * @return
-	 */
-	private String extractFileName(String path) {
-		StringTokenizer tokenizer = new StringTokenizer(path, F_PATH_SEPARATOR);
-		while (tokenizer.countTokens() > 1) {
-			tokenizer.nextToken();
-		}
-		return tokenizer.nextToken();
-	}
-
-	/**
-	 * @param path
-	 * @return
-	 */
-	private String convertPathAbsToRelative(String relativePath, String basePath) {
-		StringTokenizer convertPathTokenizer = new StringTokenizer(relativePath, F_PATH_SEPARATOR);
-		StringTokenizer basePathTokenizer = new StringTokenizer(basePath, F_PATH_SEPARATOR);
-		// First entry is the project name
-		String convertPathToken = convertPathTokenizer.nextToken();
-		String basePathToken = basePathTokenizer.nextToken();
-		// If the project names don't match, then we cannot make a relative
-		// path
-		if (convertPathToken.equals(basePathToken) == false) {
-			return ""; //$NON-NLS-1$
-		}
-		// Process base and convert path segments to make a relative path
-		while (basePathTokenizer.hasMoreTokens() && convertPathTokenizer.hasMoreTokens()) {
-
-			if (basePathTokenizer.countTokens() == 1) {
-				// Only the base file name is left
-				// No ".." required
-				// No last base path segment is required since we did not
-				// get the next base path segment token
-				return createRelativePath(0, null, convertPathTokenizer);
-			} else if (convertPathTokenizer.countTokens() == 1) {
-				// Only the convert file name is left
-				// Calculate required ".."
-				// No last base path segment is required since we did not
-				// get the next base path segment token
-				return createRelativePath(basePathTokenizer.countTokens() - 1, null, convertPathTokenizer);
-			} else {
-				// Compare the next path segment
-				convertPathToken = convertPathTokenizer.nextToken();
-				basePathToken = basePathTokenizer.nextToken();
-				if (convertPathToken.equals(basePathToken) == false) {
-					// The path segments are not equal
-					// Calculate required ".."
-					// Last base path segment needs to be included in the 
-					// relative path
-					return createRelativePath(basePathTokenizer.countTokens(), convertPathToken, convertPathTokenizer);
-				}
-			}
-		}
-		// This should never happen
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * @param dotDotCount
-	 * @param tokenizer
-	 * @return
-	 */
-	private String createRelativePath(int dotDotCount, String lastToken, StringTokenizer tokenizer) {
-		StringBuffer relativePath = new StringBuffer();
-		// Prepend with the number of specified ".."
-		for (int i = 0; i < dotDotCount; i++) {
-			relativePath.append(F_DOT_DOT);
-			relativePath.append(F_PATH_SEPARATOR);
-		}
-		// Append the last token if specified
-		if (lastToken != null) {
-			relativePath.append(lastToken);
-			relativePath.append(F_PATH_SEPARATOR);
-		}
-		// Append all the path segments excluding the file itself
-		for (int i = 0; i < (tokenizer.countTokens() - 1); i++) {
-			relativePath.append(tokenizer.nextToken());
-			relativePath.append(F_PATH_SEPARATOR);
-		}
-		// Append the file itself
-		relativePath.append(tokenizer.nextToken());
-
-		return relativePath.toString();
-	}
-
-	/**
-	 * @param absolutePath
-	 */
-	private void handleLinkEventPathEntry(String absolutePath) {
-		IWorkspaceRoot root = PDEPlugin.getWorkspace().getRoot();
-		Path path = new Path(absolutePath);
-		// If the path is empty open the new simple cheat sheet wizard
-		if (path.isEmpty()) {
-			handleLinkWizardPathEntry();
-			return;
-		}
-		// Try to find the simple cheat sheet in the workspace
-		IResource resource = root.findMember(path);
-		// If the simple cheat sheet is found open the simple cheat sheet 
-		// editor using it as input; otherwise, opne the simple cheat sheet
-		// wizard
-		if ((resource != null) && (resource instanceof IFile)) {
-			try {
-				IDE.openEditor(PDEUserAssistanceUIPlugin.getActivePage(), (IFile) resource, true);
-			} catch (PartInitException e) {
-				// Ignore
-			}
-		} else {
-			handleLinkWizardPathEntry();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void handleLinkWizardPathEntry() {
-		NewSimpleCSFileWizard wizard = new NewSimpleCSFileWizard();
-		// Select in the tree view the directory this composite cheat sheet is 
-		// stored in
-		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection(fDataTask.getModel().getUnderlyingResource()));
-		// Create the dialog for the wizard
-		WizardDialog dialog = new WizardDialog(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		// Get the wizard page
-		IWizardPage wizardPage = wizard.getPage(SimpleCSFileWizardPage.F_PAGE_NAME);
-		if ((wizardPage instanceof SimpleCSFileWizardPage) == false) {
-			return;
-		}
-		SimpleCSFileWizardPage page = (SimpleCSFileWizardPage) wizardPage;
-		// Set the initial file name
-		String initialValue = fPathEntry.getValue().trim();
-		if (initialValue.length() > 0) {
-			// It is a relative file name
-			page.setFileName(extractFileName(initialValue));
-		}
-		// Restrict user choices of where to store the new simple cheat sheet
-		// to only the project name this composite cheat sheet is stored in
-		page.setProjectName(fDataTask.getModel().getUnderlyingResource().getProject().getName());
-		// Check the result
-		if (dialog.open() == Window.OK) {
-			String newValue = convertPathAbsToRelative(page.getAbsoluteFileName(), fDataTask.getModel().getUnderlyingResource().getFullPath().toPortableString());
-			fPathEntry.setValue(newValue, true);
-			handleTextEventPathEntry(newValue);
-		}
-	}
-
-	/**
-	 * @param relativePath
-	 * @return
-	 */
-	private String convertPathRelativeToAbs(String relativePath, String basePath) {
-		StringTokenizer convertPathTokenizer = new StringTokenizer(relativePath, F_PATH_SEPARATOR);
-		StringTokenizer basePathTokenizer = new StringTokenizer(basePath, F_PATH_SEPARATOR);
-		// Accumulate the non ".." path segments excluding the file name
-		// and count the number of ".." path segments
-		StringBuffer endPath = new StringBuffer();
-		int dotDotCount = 0;
-		if (convertPathTokenizer.hasMoreTokens()) {
-			while (convertPathTokenizer.countTokens() > 1) {
-				String token = convertPathTokenizer.nextToken();
-				if (token.equals(F_DOT_DOT)) {
-					dotDotCount++;
-				} else {
-					endPath.append(token);
-					endPath.append(F_PATH_SEPARATOR);
-				}
-			}
-			// Append the file name
-			endPath.append(convertPathTokenizer.nextToken());
-		}
-		// Calculate the number of base path segments to accumulate 
-		int baseSegementCount = basePathTokenizer.countTokens() - dotDotCount - 1;
-		// Check to see if the relative path is bogus
-		if (baseSegementCount < 0) {
-			return ""; //$NON-NLS-1$
-		}
-		// Accumulate the initial path segments making up the absolute path
-		StringBuffer startPath = new StringBuffer(F_PATH_SEPARATOR);
-		for (int i = 0; i < baseSegementCount; i++) {
-			startPath.append(basePathTokenizer.nextToken());
-			startPath.append(F_PATH_SEPARATOR);
-		}
-		// Concatenate the start and end paths together to get the absolute
-		// paths
-		return startPath.toString() + endPath.toString();
-	}
-
-	/**
-	 * @param newValue
-	 */
-	private void handleTextEventPathEntry(String newValue) {
-		// Check for existing parameters
-		if (fDataTask.hasFieldParams()) {
-			// There are existing parameters
-			// Check for an existing "path" parameter
-			ICompCSParam parameter = fDataTask.getFieldParam(ICompCSConstants.ATTRIBUTE_VALUE_PATH);
-			if (parameter != null) {
-				parameter.setFieldValue(newValue);
-			} else {
-				// No suitable parameter found
-				// Create a new "path" parameter
-				createTaskParamPathEntry(newValue);
-			}
-		} else {
-			// No existing parameters
-			// Create a new "path" parameter
-			createTaskParamPathEntry(newValue);
-		}
-	}
-
-	/**
-	 * @param newValue
-	 */
-	private void createTaskParamPathEntry(String newValue) {
-		ICompCSModelFactory factory = fDataTask.getModel().getFactory();
-		// Create parameter
-		ICompCSParam parameter = factory.createCompCSParam(fDataTask);
-		// Configure parameter
-		parameter.setFieldName(ICompCSConstants.ATTRIBUTE_VALUE_PATH);
-		parameter.setFieldValue(newValue);
-		// Add parameter to the task
-		fDataTask.addFieldParam(parameter);
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersSkipButton() {
-		fSkip.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fDataTask == null) {
-					return;
-				}
-				fDataTask.setFieldSkip(fSkip.getSelection());
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataTask == null) {
-			return;
-		}
-		boolean editable = isEditableElement();
-		// Update name entry
-		updateNameEntry(editable);
-		// Update kind combo
-		updatePathEntry(editable);
-		// Update skip button
-		updateSkipButton(editable);
-		// Update fields within enclosing text section		
-		fEnclosingTextSection.updateFields();
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateNameEntry(boolean editable) {
-		fNameEntry.setValue(fDataTask.getFieldName(), true);
-		fNameEntry.setEditable(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updatePathEntry(boolean editable) {
-		ICompCSParam parameter = fDataTask.getFieldParam(ICompCSConstants.ATTRIBUTE_VALUE_PATH);
-		if (parameter != null) {
-			fPathEntry.setValue(parameter.getFieldValue(), true);
-		} else {
-			fPathEntry.setValue("", true); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateSkipButton(boolean editable) {
-		fSkip.setSelection(fDataTask.getFieldSkip());
-		fSkip.setEnabled(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fNameEntry.commit();
-		fPathEntry.commit();
-		// No need to call for sub details, because they contain no form entries
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if ((object == null) || (object instanceof ICompCSTask) == false) {
-			return;
-		}
-		// Set data
-		setData((ICompCSTask) object);
-		// Update the UI given the new data
-		updateFields();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		// Dispose of the enclosing text section
-		if (fEnclosingTextSection != null) {
-			fEnclosingTextSection.dispose();
-			fEnclosingTextSection = null;
-		}
-		super.dispose();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskGroupDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskGroupDetails.java
deleted file mode 100755
index d9d1e52..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskGroupDetails.java
+++ /dev/null

@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSTaskGroup;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.CompCSInputContext;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.parts.ComboPart;
-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.graphics.Color;
-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.ui.forms.IFormColors;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * CompCSTaskGroupDetails
- *
- */
-public class CompCSTaskGroupDetails extends CSAbstractDetails {
-
-	private Section fDefinitionSection;
-
-	private FormEntry fNameEntry;
-
-	private ComboPart fKindCombo;
-
-	private Button fSkip;
-
-	private ICompCSTaskGroup fDataTaskGroup;
-
-	private CompCSEnclosingTextDetails fEnclosingTextSection;
-
-	private static final String F_KIND_VALUE_SET = DetailsMessages.CompCSTaskGroupDetails_set;
-
-	private static final String F_KIND_VALUE_CHOICE = DetailsMessages.CompCSTaskGroupDetails_choice;
-
-	private static final String F_KIND_VALUE_SEQUENCE = DetailsMessages.CompCSTaskGroupDetails_sequence;
-
-	/**
-	 * @param section
-	 */
-	public CompCSTaskGroupDetails(ICSMaster section) {
-		super(section, CompCSInputContext.CONTEXT_ID);
-		fDataTaskGroup = null;
-
-		fNameEntry = null;
-		fKindCombo = null;
-		fSkip = null;
-
-		fDefinitionSection = null;
-		fEnclosingTextSection = new CompCSEnclosingTextDetails(ICompCSConstants.TYPE_TASKGROUP, section);
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ICompCSTaskGroup object) {
-		// Set data
-		fDataTaskGroup = object;
-		// Set data on the enclosing text section
-		fEnclosingTextSection.setData(object);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		super.initialize(form);
-		// Unfortunately this has to be explicitly called for sub detail
-		// sections through its main section parent; since, it never is 
-		// registered directly.
-		// Initialize managed form for enclosing text section
-		fEnclosingTextSection.initialize(form);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		// Create the main section
-		int style = Section.DESCRIPTION | ExpandableComposite.TITLE_BAR;
-		fDefinitionSection = getPage().createUISection(parent, DetailsMessages.CompCSTaskGroupDetails_sectionTitle, DetailsMessages.CompCSTaskGroupDetails_sectionDescription, style);
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fDefinitionSection);
-		// Create the container for the main section
-		Composite sectionClient = getPage().createUISectionContainer(fDefinitionSection, 2);
-		// Create the name entry
-		createUINameEntry(sectionClient);
-		// Create the kind label
-		createUIKindLabel(sectionClient);
-		// Create the kind combo
-		createUIKindCombo(sectionClient);
-		// Create the skip button
-		createUISkipButton(sectionClient);
-		// Create the enclosing text section
-		fEnclosingTextSection.createDetails(parent);
-		// Bind widgets
-		getManagedForm().getToolkit().paintBordersFor(sectionClient);
-		fDefinitionSection.setClient(sectionClient);
-		markDetailsPart(fDefinitionSection);
-
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUISkipButton(Composite parent) {
-		Color foreground = getToolkit().getColors().getColor(IFormColors.TITLE);
-		fSkip = getToolkit().createButton(parent, DetailsMessages.CompCSTaskGroupDetails_optional, SWT.CHECK);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		fSkip.setLayoutData(data);
-		fSkip.setForeground(foreground);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIKindLabel(Composite parent) {
-		Color foreground = getToolkit().getColors().getColor(IFormColors.TITLE);
-		Label label = getToolkit().createLabel(parent, DetailsMessages.CompCSTaskGroupDetails_type, SWT.WRAP);
-		label.setForeground(foreground);
-		label.setToolTipText(DetailsMessages.CompCSTaskGroupDetails_tooltip1);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIKindCombo(Composite parent) {
-		fKindCombo = new ComboPart();
-		fKindCombo.createControl(parent, getToolkit(), SWT.READ_ONLY);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		// Needed to align vertically with form entry field and allow space
-		// for a possible field decoration
-		data.horizontalIndent = FormLayoutFactory.CONTROL_HORIZONTAL_INDENT;
-		fKindCombo.getControl().setLayoutData(data);
-		fKindCombo.add(F_KIND_VALUE_SET);
-		fKindCombo.add(F_KIND_VALUE_SEQUENCE);
-		fKindCombo.add(F_KIND_VALUE_CHOICE);
-		fKindCombo.setText(F_KIND_VALUE_SET);
-		fKindCombo.getControl().setToolTipText(DetailsMessages.CompCSTaskGroupDetails_tooltip2);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUINameEntry(Composite parent) {
-		fNameEntry = new FormEntry(parent, getManagedForm().getToolkit(), DetailsMessages.CompCSTaskGroupDetails_name, SWT.NONE);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// Create listeners for the name entry
-		createListenersNameEntry();
-		// Create listeners for the kind combo
-		createListenersKindCombo();
-		// Create listeners for the skip button
-		createListenersSkipButton();
-		// Create listeners within the enclosing text section
-		fEnclosingTextSection.hookListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersNameEntry() {
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTaskGroup == null) {
-					return;
-				}
-				fDataTaskGroup.setFieldName(fNameEntry.getValue());
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersKindCombo() {
-		fKindCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fDataTaskGroup == null) {
-					return;
-				}
-				String selection = fKindCombo.getSelection();
-				if (selection.equals(F_KIND_VALUE_CHOICE)) {
-					fDataTaskGroup.setFieldKind(ICompCSConstants.ATTRIBUTE_VALUE_CHOICE);
-				} else if (selection.equals(F_KIND_VALUE_SEQUENCE)) {
-					fDataTaskGroup.setFieldKind(ICompCSConstants.ATTRIBUTE_VALUE_SEQUENCE);
-				} else if (selection.equals(F_KIND_VALUE_SET)) {
-					fDataTaskGroup.setFieldKind(ICompCSConstants.ATTRIBUTE_VALUE_SET);
-				}
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createListenersSkipButton() {
-		fSkip.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fDataTaskGroup == null) {
-					return;
-				}
-				fDataTaskGroup.setFieldSkip(fSkip.getSelection());
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataTaskGroup == null) {
-			return;
-		}
-		boolean editable = isEditableElement();
-		// Update name entry
-		updateNameEntry(editable);
-		// Update kind combo
-		updateKindCombo(editable);
-		// Update skip button
-		updateSkipButton(editable);
-		// Update fields within enclosing text section
-		fEnclosingTextSection.updateFields();
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateNameEntry(boolean editable) {
-		fNameEntry.setValue(fDataTaskGroup.getFieldName(), true);
-		fNameEntry.setEditable(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateKindCombo(boolean editable) {
-		String kind = fDataTaskGroup.getFieldKind();
-
-		if (kind == null) {
-			// NO-OP
-		} else if (kind.compareTo(ICompCSConstants.ATTRIBUTE_VALUE_SEQUENCE) == 0) {
-			fKindCombo.setText(F_KIND_VALUE_SEQUENCE);
-		} else if (kind.compareTo(ICompCSConstants.ATTRIBUTE_VALUE_CHOICE) == 0) {
-			fKindCombo.setText(F_KIND_VALUE_CHOICE);
-		} else {
-			fKindCombo.setText(F_KIND_VALUE_SET);
-		}
-
-		fKindCombo.setEnabled(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateSkipButton(boolean editable) {
-		fSkip.setSelection(fDataTaskGroup.getFieldSkip());
-		fSkip.setEnabled(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fNameEntry.commit();
-		// No need to call for sub details, because they contain no form entries
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if ((object == null) || (object instanceof ICompCSTaskGroup) == false) {
-			return;
-		}
-		// Set data
-		setData((ICompCSTaskGroup) object);
-		// Update the UI given the new data
-		updateFields();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		// Dispose of the enclosing text section
-		if (fEnclosingTextSection != null) {
-			fEnclosingTextSection.dispose();
-			fEnclosingTextSection = null;
-		}
-		super.dispose();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/DetailsMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/DetailsMessages.java
deleted file mode 100644
index 4706d4e..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/DetailsMessages.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details;
-
-import org.eclipse.osgi.util.NLS;
-
-public class DetailsMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.cheatsheet.comp.details.messages"; //$NON-NLS-1$
-	public static String CompCSDetails_name;
-	public static String CompCSDetails_sectionDescription;
-	public static String CompCSDetails_sectionTitle;
-	public static String CompCSEnclosingTextDetails_conclusion;
-	public static String CompCSEnclosingTextDetails_description;
-	public static String CompCSEnclosingTextDetails_enclosing;
-	public static String CompCSEnclosingTextDetails_group;
-	public static String CompCSEnclosingTextDetails_introduction;
-	public static String CompCSEnclosingTextDetails_label;
-	public static String CompCSEnclosingTextDetails_labelDescription;
-	public static String CompCSEnclosingTextDetails_task;
-	public static String CompCSTaskDetails_browse;
-	public static String CompCSTaskDetails_description;
-	public static String CompCSTaskDetails_name;
-	public static String CompCSTaskDetails_optional;
-	public static String CompCSTaskDetails_path;
-	public static String CompCSTaskDetails_title;
-	public static String CompCSTaskDetails_wizardDescription;
-	public static String CompCSTaskDetails_wizardTitle;
-	public static String CompCSTaskGroupDetails_choice;
-	public static String CompCSTaskGroupDetails_name;
-	public static String CompCSTaskGroupDetails_optional;
-	public static String CompCSTaskGroupDetails_sectionDescription;
-	public static String CompCSTaskGroupDetails_sectionTitle;
-	public static String CompCSTaskGroupDetails_sequence;
-	public static String CompCSTaskGroupDetails_set;
-	public static String CompCSTaskGroupDetails_tooltip1;
-	public static String CompCSTaskGroupDetails_tooltip2;
-	public static String CompCSTaskGroupDetails_type;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, DetailsMessages.class);
-	}
-
-	private DetailsMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/messages.properties
deleted file mode 100644
index 1eda4b4..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/messages.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-CompCSDetails_name=Name*:
-CompCSDetails_sectionDescription=Specify the display name of this cheat sheet:
-CompCSDetails_sectionTitle=Definition
-CompCSEnclosingTextDetails_conclusion=Conclusion
-CompCSEnclosingTextDetails_description=Optionally, define an introduction and a conclusion for this {0}:
-CompCSEnclosingTextDetails_enclosing=Enclosing Text
-CompCSEnclosingTextDetails_group=group
-CompCSEnclosingTextDetails_introduction=Introduction
-CompCSEnclosingTextDetails_label=Specify the text displayed before this {0} is started:
-CompCSEnclosingTextDetails_labelDescription=Specify the text displayed after this {0} is finished:
-CompCSEnclosingTextDetails_task=task
-CompCSTaskDetails_browse=Browse...
-CompCSTaskDetails_description=Specify the display name and the path of this task:
-CompCSTaskDetails_name=Name*:
-CompCSTaskDetails_optional=This task is optional
-CompCSTaskDetails_path=Path*:
-CompCSTaskDetails_title=Definition
-CompCSTaskDetails_wizardDescription=Select a simple cheat sheet:
-CompCSTaskDetails_wizardTitle=Cheat Sheet Selection
-CompCSTaskGroupDetails_choice=Choice
-CompCSTaskGroupDetails_name=Name*:
-CompCSTaskGroupDetails_optional=This group is optional
-CompCSTaskGroupDetails_sectionDescription=Specify the display name and the type of this group:
-CompCSTaskGroupDetails_sectionTitle=Definition
-CompCSTaskGroupDetails_sequence=Sequence
-CompCSTaskGroupDetails_set=Set
-CompCSTaskGroupDetails_tooltip1==Set: The task group is complete when all of its children are completed.\nSequence: The task group is complete when all of its children are completed in order.\nChoice: The task group is complete when any one of its children are completed.
-CompCSTaskGroupDetails_tooltip2=Set: The task group is complete when all of its children are completed.\nSequence: The task group is complete when all of its children are completed in order.\nChoice: The task group is complete when any one of its children are completed.
-CompCSTaskGroupDetails_type=Type*:

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/messages.properties
deleted file mode 100644
index d5245e5..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/messages.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-CompCSFileValidator_0=The selected file is not a simple cheat sheet
-CompCSMasterTreeSection_addGroup=Add Group
-CompCSMasterTreeSection_addTask=Add Task
-CompCSMasterTreeSection_collapseAll=Collapse All
-CompCSMasterTreeSection_content=Content
-CompCSMasterTreeSection_Content=Content
-CompCSMasterTreeSection_Down=Down
-CompCSMasterTreeSection_new=&New
-CompCSMasterTreeSection_Preview=Preview
-CompCSMasterTreeSection_Remove=Remove
-CompCSMasterTreeSection_sectionDesc=Edit the structure of this cheat sheet in the following section.
-CompCSMasterTreeSection_Up=Up
-CompCSPage_definition=Definition
-CompCSPage_error=An error was encountered while parsing the cheat sheet XML file.
-CompCSPage_loadFailure=Cheat Sheet Load Failure

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/messages.properties
deleted file mode 100644
index 9cf28a0..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/messages.properties
+++ /dev/null

@@ -1 +0,0 @@
-CSAbstractEditor_register=Register this cheat sheet

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/ISimpleCSCommandKeyListener.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/ISimpleCSCommandKeyListener.java
deleted file mode 100755
index 91ce3f3..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/ISimpleCSCommandKeyListener.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-/**
- * ISimpleCSCommandKeyListener
- *
- */
-public interface ISimpleCSCommandKeyListener {
-
-	/**
-	 * @param event
-	 */
-	public void newCommandKey(NewCommandKeyEvent event);
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java
deleted file mode 100755
index f96d6e7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import java.util.EventObject;
-
-/**
- * NewCommandKeyEvent
- *
- */
-public class NewCommandKeyEvent extends EventObject {
-
-	private static final long serialVersionUID = 1L;
-
-	private String fKey;
-
-	private String fValue;
-
-	/**
-	 * @param source
-	 * @param key
-	 * @param value
-	 */
-	public NewCommandKeyEvent(Object source, String key, String value) {
-		super(source);
-		fKey = key;
-		fValue = value;
-	}
-
-	/**
-	 * @return the key
-	 */
-	public String getKey() {
-		return fKey;
-	}
-
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return fValue;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSBlock.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSBlock.java
deleted file mode 100755
index bd18c3c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSBlock.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSIntro;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details.SimpleCSDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details.SimpleCSIntroDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details.SimpleCSItemDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details.SimpleCSSubItemDetails;
-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.forms.DetailsPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IDetailsPageProvider;
-import org.eclipse.ui.forms.IManagedForm;
-
-/**
- * SimpleCSBlock
- *
- */
-public class SimpleCSBlock extends PDEMasterDetailsBlock implements IDetailsPageProvider, IModelChangedListener {
-
-	private SimpleCSMasterTreeSection fMasterSection;
-
-	private SimpleCSItemDetails fItemDetails;
-
-	private SimpleCSSubItemDetails fSubItemDetails;
-
-	private SimpleCSDetails fCheatSheetDetails;
-
-	private SimpleCSIntroDetails fIntroDetails;
-
-	/**
-	 * @param page
-	 */
-	public SimpleCSBlock(PDEFormPage page) {
-		super(page);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock#createMasterSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)
-	 */
-	protected PDESection createMasterSection(IManagedForm managedForm, Composite parent) {
-		fMasterSection = new SimpleCSMasterTreeSection(getPage(), parent);
-		return fMasterSection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.forms.DetailsPart)
-	 */
-	protected void registerPages(DetailsPart detailsPart) {
-		// Only static pages to be defined.  Do not cache pages
-		detailsPart.setPageLimit(0);
-		// Register static page:  item
-		fItemDetails = new SimpleCSItemDetails(fMasterSection);
-		detailsPart.registerPage(SimpleCSItemDetails.class, fItemDetails);
-		// Register static page:  subitem
-		fSubItemDetails = new SimpleCSSubItemDetails(fMasterSection);
-		detailsPart.registerPage(SimpleCSSubItemDetails.class, fSubItemDetails);
-		// Register static page:  cheatsheet
-		fCheatSheetDetails = new SimpleCSDetails(fMasterSection);
-		detailsPart.registerPage(SimpleCSDetails.class, fCheatSheetDetails);
-		// Register static page:  intro
-		fIntroDetails = new SimpleCSIntroDetails(fMasterSection);
-		detailsPart.registerPage(SimpleCSIntroDetails.class, fIntroDetails);
-		// Set this class as the page provider
-		detailsPart.setPageProvider(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPageKey(java.lang.Object)
-	 */
-	public Object getPageKey(Object object) {
-		// Get static page key
-		if (object instanceof ISimpleCSItem) {
-			// Static page:  item
-			return SimpleCSItemDetails.class;
-		} else if (object instanceof ISimpleCSSubItem) {
-			// Static page:  subitem
-			return SimpleCSSubItemDetails.class;
-		} else if (object instanceof ISimpleCS) {
-			// Static page:  cheatsheet
-			return SimpleCSDetails.class;
-		} else if (object instanceof ISimpleCSIntro) {
-			// Static page:  intro
-			return SimpleCSIntroDetails.class;
-		}
-		// Should never reach here
-		return object.getClass();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPage(java.lang.Object)
-	 */
-	public IDetailsPage getPage(Object key) {
-		// No dynamic pages.  Static pages already registered
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// Inform the master section
-		if (fMasterSection != null) {
-			fMasterSection.modelChanged(event);
-		}
-		// Inform the details section
-		// Unnecessary
-		//if (fCurrentDetailsSection != null) {
-		//	fCurrentDetailsSection.modelChanged(event);
-		//}
-	}
-
-	/**
-	 * @return
-	 */
-	public ICSMaster getMastersSection() {
-		return fMasterSection;
-	}
-
-	/**
-	 * @return
-	 */
-	public ISelection getSelection() {
-		if (fMasterSection != null) {
-			return fMasterSection.getSelection();
-		}
-		return null;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java
deleted file mode 100755
index 2658e8c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.ListenerList;
-
-/**
- * SimpleCSCommandManager
- *
- */
-public class SimpleCSCommandManager {
-
-	private ListenerList fListeners;
-
-	private static SimpleCSCommandManager fPinstance;
-
-	private Map fCommandMap;
-
-	private boolean fBlockEvents;
-
-	/**
-	 * 
-	 */
-	private SimpleCSCommandManager() {
-		fCommandMap = Collections.synchronizedMap(new HashMap());
-		fBlockEvents = false;
-		fListeners = null;
-	}
-
-	/**
-	 * @param block
-	 */
-	public void setBlockEvents(boolean block) {
-		fBlockEvents = block;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean getBlockEvents() {
-		return fBlockEvents;
-	}
-
-	/**
-	 * @return
-	 */
-	public static SimpleCSCommandManager Instance() {
-		if (fPinstance == null) {
-			fPinstance = new SimpleCSCommandManager();
-		}
-		return fPinstance;
-	}
-
-	/**
-	 * @param key
-	 * @param value
-	 * @return 
-	 */
-	public synchronized boolean put(String key, String value) {
-		// Do not add the key-value pair if it is already in the map
-		if (fCommandMap.containsKey(key)) {
-			String presentValue = (String) fCommandMap.get(key);
-			if ((presentValue == null) && (value == null)) {
-				// Key-value pair not added
-				return false;
-			} else if ((presentValue != null) && (presentValue.equals(value))) {
-				// Key-value pair not added
-				return false;
-			}
-		}
-		// Insert the key-value pair into the map
-		fCommandMap.put(key, value);
-		// Notify all listeners of the new key-value pair
-		fireNewCommandKeyEvent(key, value);
-		// Key-value pair added
-		return true;
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	public String get(String key) {
-		return (String) fCommandMap.get(key);
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	public boolean hasKey(String key) {
-		return fCommandMap.containsKey(key);
-	}
-
-	/**
-	 * @return
-	 */
-	public Set getKeys() {
-		return fCommandMap.keySet();
-	}
-
-	/**
-	 * @return
-	 */
-	public int getSize() {
-		return fCommandMap.size();
-	}
-
-	/**
-	 * @param listener
-	 */
-	public void addCommandKeyListener(ISimpleCSCommandKeyListener listener) {
-		if (fListeners == null) {
-			fListeners = new ListenerList();
-		}
-		fListeners.add(listener);
-	}
-
-	/**
-	 * @param listener
-	 */
-	public void removeCommandKeyListener(ISimpleCSCommandKeyListener listener) {
-		if (fListeners == null) {
-			return;
-		}
-		fListeners.remove(listener);
-	}
-
-	/**
-	 * @param key
-	 * @param value
-	 */
-	private void fireNewCommandKeyEvent(String key, String value) {
-		// Do not fire the event if there are no listeners or we are blocking
-		// events
-		if ((fBlockEvents == true) || (fListeners == null) || (fListeners.size() == 0)) {
-			return;
-		}
-		// Create the event
-		NewCommandKeyEvent event = new NewCommandKeyEvent(this, key, value);
-		// Notify all listeners
-		Object[] listenerList = fListeners.getListeners();
-		for (int i = 0; i < fListeners.size(); i++) {
-			ISimpleCSCommandKeyListener listener = (ISimpleCSCommandKeyListener) listenerList[i];
-			listener.newCommandKey(event);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSContentProvider.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSContentProvider.java
deleted file mode 100755
index 5092aa3..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSContentProvider.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-
-public class SimpleCSContentProvider implements ITreeContentProvider {
-
-	public SimpleCSContentProvider() {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.
-	 * Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof ISimpleCSModel) {
-			return new Object[] { ((ISimpleCSModel) parentElement)
-					.getSimpleCS() };
-		} else if (parentElement instanceof ISimpleCSObject) {
-			List list = ((ISimpleCSObject) parentElement).getChildren();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-		return new Object[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object
-	 * )
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof ISimpleCSObject) {
-			return ((ISimpleCSObject) element).getParent();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.
-	 * Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return (getChildren(element).length > 0);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java
-	 * .lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	public void dispose() {
-		// no op
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// no op
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java
deleted file mode 100755
index 5ae2388..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java
+++ /dev/null

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

- * Copyright (c) 2006, 2009 IBM Corporation and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

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

-

-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;

-

-import org.eclipse.jface.text.source.ISourceViewer;

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

-import org.eclipse.pde.core.IModelChangedEvent;

-import org.eclipse.pde.core.IModelChangedListener;

-import org.eclipse.pde.internal.core.AbstractModel;

-import org.eclipse.pde.internal.core.text.IDocumentRange;

-import org.eclipse.pde.internal.core.util.PDETextHelper;

-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;

-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;

-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;

-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;

-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;

-import org.eclipse.pde.internal.ui.IHelpContextIds;

-import org.eclipse.pde.internal.ui.editor.PDEFormPage;

-import org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock;

-import org.eclipse.pde.internal.ui.editor.PDESourcePage;

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

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.forms.IManagedForm;

-import org.eclipse.ui.forms.editor.FormEditor;

-import org.eclipse.ui.forms.editor.IFormPage;

-import org.eclipse.ui.forms.widgets.ScrolledForm;

-

-/**

- * SimpleCSPage

- * 

- */

-public class SimpleCSDefinitionPage extends PDEFormPage implements

-		IModelChangedListener {

-

-	public static final String PAGE_ID = "simpleCSPage"; //$NON-NLS-1$

-

-	private SimpleCSBlock fBlock;

-	private boolean fStale;

-

-	/**

-	 * @param editor

-	 */

-	public SimpleCSDefinitionPage(FormEditor editor) {

-		super(editor, PAGE_ID, SimpleMessages.SimpleCSDefinitionPage_title);

-		fBlock = new SimpleCSBlock(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#getHelpResource()

-	 */

-	protected String getHelpResource() {

-		return IHelpContextIds.SIMPLE_CS_EDITOR;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see

-	 * org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.

-	 * eclipse.ui.forms.IManagedForm)

-	 */

-	protected void createFormContent(IManagedForm managedForm) {

-		// Bug: Two veritical scrollbars appear when resizing the editor

-		// vertically

-		// Note: Scrolled form #1 created here

-		ScrolledForm form = managedForm.getForm();

-		// Set page title

-		ISimpleCSModel model = (ISimpleCSModel) getModel();

-		// Ensure the model was loaded properly

-		if ((model == null) || (model.isLoaded() == false)) {

-			Exception e = null;

-			if (model instanceof AbstractModel) {

-				e = ((AbstractModel) model).getException();

-			}

-			// Create a formatted error page

-			createFormErrorContent(managedForm,

-					SimpleMessages.SimpleCSDefinitionPage_loadFailure,

-					SimpleMessages.SimpleCSDefinitionPage_errorMessage, e);

-			return;

-		}

-		// Create the rest of the actions in the form title area

-		super.createFormContent(managedForm);

-		// Form image

-		form.setImage(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider()

-				.get(PDEUserAssistanceUIPluginImages.DESC_CHEATSHEET_OBJ));

-		// Form title

-		String title = PDETextHelper.translateReadText(model.getSimpleCS()

-				.getTitle());

-		if (title.length() > 0) {

-			form.setText(title);

-		} else {

-			form.setText(SimpleMessages.SimpleCSDefinitionPage_title);

-		}

-		// Create the masters details block

-		// Note: Scrolled form #2 created here

-		fBlock.createContent(managedForm);

-		// Force the selection in the masters tree section to load the

-		// proper details section

-		fBlock.getMastersSection().fireSelection();

-		// Register this page to be informed of model change events

-		model.addModelChangedListener(this);

-		// Set context-sensitive help

-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(),

-				IHelpContextIds.SIMPLE_CS_EDITOR);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#dispose()

-	 */

-	public void dispose() {

-

-		ISimpleCSModel simpleCSModel = (ISimpleCSModel) getModel();

-		if (simpleCSModel != null) {

-			simpleCSModel.removeModelChangedListener(this);

-		}

-		super.dispose();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see

-	 * org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde

-	 * .core.IModelChangedEvent)

-	 */

-	public void modelChanged(IModelChangedEvent event) {

-

-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {

-			Object[] objects = event.getChangedObjects();

-			// Ensure right type

-			if ((objects[0] instanceof ISimpleCSObject) == false) {

-				return;

-			}

-			ISimpleCSObject object = (ISimpleCSObject) objects[0];

-			if (object == null) {

-				// Ignore

-			} else if (object.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {

-				String changeProperty = event.getChangedProperty();

-				if ((changeProperty != null)

-						&& changeProperty

-								.equals(ISimpleCSConstants.ATTRIBUTE_TITLE)) {

-					// Has to be a String if the property is a title

-					// Update the form page title

-					getManagedForm().getForm().setText(

-							PDETextHelper.translateReadText((String) event

-									.getNewValue()));

-				}

-			}

-		} else if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {

-			fStale = true;

-		}

-		// Inform the block

-		fBlock.modelChanged(event);

-	}

-

-	/**

-	 * @return

-	 */

-	public ISelection getSelection() {

-		return fBlock.getSelection();

-	}

-

-	/**

-	 * @return

-	 */

-	public PDEMasterDetailsBlock getBlock() {

-		return fBlock;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#setActive(boolean)

-	 */

-	public void setActive(boolean active) {

-		super.setActive(active);

-

-		if (active == false) {

-			// Switching away from this page

-			return;

-		}

-		// Switching into this page

-		// Get source page

-		IFormPage page = getPDEEditor().findPage(

-				SimpleCSInputContext.CONTEXT_ID);

-		// Ensure we got the source page

-		if ((page instanceof PDESourcePage) == false) {

-			return;

-		}

-		PDESourcePage sourcePage = (PDESourcePage) page;

-		// Get the source viewer

-		ISourceViewer viewer = sourcePage.getViewer();

-		// Ensure the viewer is defined

-		if (viewer == null) {

-			return;

-		}

-		// Get the styled text

-		StyledText text = viewer.getTextWidget();

-		// Ensure the styled text is defined

-		if (text == null) {

-			return;

-		}

-		// Get the cursor offset

-		int offset = text.getCaretOffset();

-		// Ensure the offset is defined

-		if (offset < 0) {

-			return;

-		}

-		// Get the range the offset is on

-		IDocumentRange range = sourcePage.getRangeElement(offset, true);

-		// Adapt the range to a node representable in the master tree viewer

-		range = sourcePage.adaptRange(range);

-		// Ensure the range is defined

-		if (range == null) {

-			return;

-		}

-		// Select the node in the master tree viewer if defined

-		fBlock.getMastersSection().setFormInput(range);

-

-		if (fStale) {

-			// If we get a global model change the model's title may have

-			// changed

-			ScrolledForm form = getManagedForm().getForm();

-			ISimpleCSModel model = (ISimpleCSModel) getModel();

-			String oldTitle = form.getText();

-			String newTitle = model.getSimpleCS().getTitle();

-			if (!newTitle.equals(oldTitle)) {

-				// Update form page title

-				form.setText(PDETextHelper.translateReadText(newTitle));

-			}

-		}

-	}

-

-}


diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditor.java
deleted file mode 100755
index 1127722..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditor.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractEditor;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-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.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;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-
-public class SimpleCSEditor extends CSAbstractEditor {
-
-	public SimpleCSEditor() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getEditorID()
-	 */
-	protected String getEditorID() {
-		return IConstants.SIMPLE_CHEAT_SHEET_EDITOR_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getContextIDForSaveAs()
-	 */
-	public String getContextIDForSaveAs() {
-		return SimpleCSInputContext.CONTEXT_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#addEditorPages()
-	 */
-	protected void addEditorPages() {
-		// Add form pages
-		try {
-			addPage(new SimpleCSDefinitionPage(this));
-		} catch (PartInitException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-		// Add source page
-		addSourcePage(SimpleCSInputContext.CONTEXT_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createContentOutline()
-	 */
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new SimpleCSFormOutlinePage(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createInputContextManager()
-	 */
-	protected InputContextManager createInputContextManager() {
-		return new SimpleCSInputContextManager(this);
-	}
-
-	/* (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 contexts, IFileEditorInput input) {
-		contexts.putContext(input, new SimpleCSInputContext(this, input, true));
-		contexts.monitorFile(input.getFile());
-	}
-
-	/* (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 contexts, IStorageEditorInput input) {
-		contexts.putContext(input, new SimpleCSInputContext(this, input, true));
-	}
-
-	/* (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 contexts, FileStoreEditorInput input) {
-		try {
-			IFileStore store = EFS.getStore(input.getURI());
-			IEditorInput in = new FileStoreEditorInput(store);
-			contexts.putContext(in, new SimpleCSInputContext(this, in, true));
-		} catch (CoreException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#editorContextAdded(org.eclipse.pde.internal.ui.editor.context.InputContext)
-	 */
-	public void editorContextAdded(InputContext context) {
-		// Add the source page
-		addSourcePage(context.getId());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		return fInputContextManager.findContext(SimpleCSInputContext.CONTEXT_ID);
-	}
-
-	/* (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(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileAdded(org.eclipse.core.resources.IFile)
-	 */
-	public void monitoredFileAdded(IFile monitoredFile) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileRemoved(org.eclipse.core.resources.IFile)
-	 */
-	public boolean monitoredFileRemoved(IFile monitoredFile) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getSelection()
-	 */
-	public ISelection getSelection() {
-		// Override the parent getSelection because it doesn't work.
-		// The selection provider operates at the form level and does not 
-		// track selections made in the master tree view.
-		// The selection is required to synchronize the master tree view with 
-		// the outline view
-		IFormPage formPage = getActivePageInstance();
-		if ((formPage != null) && (formPage instanceof SimpleCSDefinitionPage)) {
-			// Synchronizes the selection made in the master tree view with the
-			// selection in the outline view when the link with editor button
-			// is toggled on
-			return ((SimpleCSDefinitionPage) formPage).getSelection();
-		}
-		return super.getSelection();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#computeInitialPageId()
-	 */
-	protected String computeInitialPageId() {
-		String firstPageId = super.computeInitialPageId();
-		if (firstPageId == null) {
-			firstPageId = SimpleCSDefinitionPage.PAGE_ID;
-		}
-		return firstPageId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.MultiSourceEditor#createSourcePage(org.eclipse.pde.internal.ui.editor.PDEFormEditor, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		return new SimpleCSSourcePage(editor, title, name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#canCut(org.eclipse.jface.viewers.ISelection)
-	 */
-	public boolean canCut(ISelection selection) {
-		IFormPage page = getActivePageInstance();
-		if (page instanceof PDEFormPage) {
-			return ((PDEFormPage) page).canCut(selection);
-		}
-		return super.canCut(selection);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditorContributor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditorContributor.java
deleted file mode 100755
index 5a430fd..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditorContributor.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions.SimpleCSPreviewAction;
-import org.eclipse.pde.internal.ui.editor.PDEFormTextEditorContributor;
-
-/**
- * SimpleCSFormEditorContributor
- *
- */
-public class SimpleCSEditorContributor extends PDEFormTextEditorContributor {
-
-	private SimpleCSPreviewAction fPreviewAction;
-
-	/**
-	 * @param menuName
-	 */
-	public SimpleCSEditorContributor() {
-		super("&Simple Cheat Sheet"); //$NON-NLS-1$
-		fPreviewAction = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditorContributor#makeActions()
-	 */
-	protected void makeActions() {
-		super.makeActions();
-		// Make the preview action
-		fPreviewAction = new SimpleCSPreviewAction();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditorContributor#contextMenuAboutToShow(org.eclipse.jface.action.IMenuManager, boolean)
-	 */
-	public void contextMenuAboutToShow(IMenuManager manager, boolean addClipboard) {
-		// Get the model
-		ISimpleCSModel model = (ISimpleCSModel) getEditor().getAggregateModel();
-		// Set the cheat sheet object
-		fPreviewAction.setDataModelObject(model.getSimpleCS());
-		// Set the editor input
-		fPreviewAction.setEditorInput(getEditor().getEditorInput());
-		// Add the preview action to the context menu
-		manager.add(fPreviewAction);
-		manager.add(new Separator());
-		super.contextMenuAboutToShow(manager, addClipboard);
-	}
-
-	/**
-	 * @return
-	 */
-	public SimpleCSPreviewAction getPreviewAction() {
-		return fPreviewAction;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormTextEditorContributor#supportsHyperlinking()
-	 */
-	public boolean supportsHyperlinking() {
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSFormOutlinePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSFormOutlinePage.java
deleted file mode 100755
index 4b7017c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSFormOutlinePage.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-
-public class SimpleCSFormOutlinePage extends FormOutlinePage {
-
-	/**
-	 * @param editor
-	 */
-	public SimpleCSFormOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/**
-	 * SimpleCSLabelProvider
-	 *
-	 */
-	public class SimpleCSLabelProvider extends BasicLabelProvider {
-		public SimpleCSLabelProvider(ILabelProvider ilp) {
-			super(ilp);
-		}
-
-		public String getText(Object obj) {
-			if (obj instanceof ISimpleCSObject) {
-				return getObjectText((ISimpleCSObject) obj);
-			}
-			return super.getText(obj);
-		}
-	}
-
-	/**
-	 * @param obj
-	 * @return
-	 */
-	protected String getObjectText(ISimpleCSObject obj) {
-		int limit = 50;
-
-		if (obj.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-			limit = 30;
-		} else if (obj.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			limit = 26;
-		} else if (obj.getType() == ISimpleCSConstants.TYPE_INTRO) {
-			limit = 26;
-		} else if (obj.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			limit = 22;
-		}
-
-		return PDETextHelper.truncateAndTrailOffText(PDETextHelper.translateReadText(obj.getName()), limit);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getChildren(java.lang.Object)
-	 */
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof SimpleCSDefinitionPage) {
-			ISimpleCSModel cheatsheet = (ISimpleCSModel) fEditor.getAggregateModel();
-			if ((cheatsheet != null) && cheatsheet.isLoaded()) {
-				Object[] list = new Object[1];
-				list[0] = cheatsheet.getSimpleCS();
-				return list;
-			}
-		} else if (parent instanceof ISimpleCSObject) {
-			List list = ((ISimpleCSObject) parent).getChildren();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-		return super.getChildren(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#createLabelProvider()
-	 */
-	public ILabelProvider createLabelProvider() {
-		return new SimpleCSLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getParentPageId(java.lang.Object)
-	 */
-	protected String getParentPageId(Object item) {
-		return SimpleCSDefinitionPage.PAGE_ID;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSHyperlinkDetector.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSHyperlinkDetector.java
deleted file mode 100644
index 0bf50f1..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSHyperlinkDetector.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.text.SimpleCSObject;
-import org.eclipse.pde.internal.ui.editor.PDEHyperlinkDetector;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.text.ResourceHyperlink;
-
-/**
- * SimpleCSHyperlinkDetector
- *
- */
-public class SimpleCSHyperlinkDetector extends PDEHyperlinkDetector {
-
-	/**
-	 * @param page
-	 */
-	public SimpleCSHyperlinkDetector(PDESourcePage page) {
-		super(page);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEHyperlinkDetector#detectAttributeHyperlink(org.eclipse.pde.internal.core.text.IDocumentAttributeNode)
-	 */
-	protected IHyperlink[] detectAttributeHyperlink(IDocumentAttributeNode attribute) {
-		// Get the attribute value
-		String attributeValue = attribute.getAttributeValue();
-		// Ensure the value is defined
-		if (PDETextHelper.isDefinedAfterTrim(attributeValue) == false) {
-			return null;
-		}
-		// Get attribute parent
-		IDocumentElementNode node = attribute.getEnclosingElement();
-		// Ensure the node is defined
-		if (node == null) {
-			return null;
-		} else if ((node instanceof SimpleCSObject) == false) {
-			return null;
-		}
-		SimpleCSObject csObject = (SimpleCSObject) node;
-		ISimpleCSModel model = csObject.getModel();
-		// Ensure the model is editable
-		if (model.isEditable() == false) {
-			return null;
-		}
-		// Get the underlying model resource
-		IResource resource = model.getUnderlyingResource();
-		// Create the link region
-		IRegion linkRegion = new Region(attribute.getValueOffset(), attribute.getValueLength());
-		// Create the link container
-		IHyperlink[] link = new IHyperlink[1];
-		// Create the appropriate resource hyperlink
-		if (csObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			// Item
-			if (attribute.getAttributeName().equals(ISimpleCSConstants.ATTRIBUTE_HREF)) {
-				// Href
-				link[0] = new ResourceHyperlink(linkRegion, attributeValue, resource);
-			}
-		} else if (csObject.getType() == ISimpleCSConstants.TYPE_INTRO) {
-			// Intro
-			if (attribute.getAttributeName().equals(ISimpleCSConstants.ATTRIBUTE_HREF)) {
-				// Href
-				link[0] = new ResourceHyperlink(linkRegion, attributeValue, resource);
-			}
-		}
-		// If the link is defined return it
-		if (link[0] != null) {
-			return link;
-		}
-		return null;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContext.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContext.java
deleted file mode 100755
index ee863ba..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContext.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-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.internal.core.text.AbstractEditingModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.text.SimpleCSModel;
-import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput;
-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;
-import org.eclipse.ui.IURIEditorInput;
-
-public class SimpleCSInputContext extends XMLInputContext {
-
-	public static final String CONTEXT_ID = "simplecs-context"; //$NON-NLS-1$	
-
-	/**
-	 * @param editor
-	 * @param input
-	 * @param primary
-	 */
-	public SimpleCSInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		// Ensure valid input
-		if ((input instanceof IStorageEditorInput) == false) {
-			return null;
-		}
-		// Determine if reconciling
-		boolean isReconciling = false;
-		if (input instanceof IFileEditorInput) {
-			isReconciling = true;
-		}
-		// Get document provider
-		IDocument document = getDocumentProvider().getDocument(input);
-		// Create the model
-		SimpleCSModel model = new SimpleCSModel(document, isReconciling);
-
-		if (input instanceof IFileEditorInput) {
-			// File from workspace
-			IFile file = ((IFileEditorInput) input).getFile();
-			model.setUnderlyingResource(file);
-			model.setCharset(file.getCharset());
-		} else if (input instanceof IURIEditorInput) {
-			// File from file system
-			IFileStore store = EFS.getStore(((IURIEditorInput) input).getURI());
-			model.setInstallLocation(store.getParent().toString());
-			model.setCharset(getDefaultCharset());
-		} else if (input instanceof JarEntryEditorInput) {
-			// File from JAR
-			File file = (File) ((JarEntryEditorInput) input).getAdapter(File.class);
-			model.setInstallLocation(file.toString());
-			model.setCharset(getDefaultCharset());
-		} else {
-			// File from other places like CVS
-			model.setCharset(getDefaultCharset());
-		}
-		// Load the model
-		model.load();
-
-		return model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#doRevert()
-	 */
-	public void doRevert() {
-		// TODO: MP: TEO: LOW: Generalize revert?
-		fEditOperations.clear();
-		fOperationTable.clear();
-		fMoveOperations.clear();
-		AbstractEditingModel model = (AbstractEditingModel) getModel();
-		model.reconciled(model.getDocument());
-	}
-
-	/* (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#getPartitionName()
-	 */
-	protected String getPartitionName() {
-		return "___simplecs_partition"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.XMLInputContext#reorderInsertEdits(java.util.ArrayList)
-	 */
-	protected void reorderInsertEdits(ArrayList ops) {
-		// NO-OP
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContextManager.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContextManager.java
deleted file mode 100755
index 5b51b83..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContextManager.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-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;
-
-/**
- * SimpleCSInputContextManager
- *
- */
-public class SimpleCSInputContextManager extends InputContextManager {
-
-	/**
-	 * @param editor
-	 */
-	public SimpleCSInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContextManager#getAggregateModel()
-	 */
-	public IBaseModel getAggregateModel() {
-		InputContext context = findContext(SimpleCSInputContext.CONTEXT_ID);
-		return (context != null) ? context.getModel() : null;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java
deleted file mode 100755
index c46216b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java
+++ /dev/null

@@ -1,1407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.fieldassist.ControlDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.*;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions.*;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TreeSection;
-import org.eclipse.pde.internal.ui.editor.actions.CollapseAction;
-import org.eclipse.pde.internal.ui.parts.TreePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * SimpleCSElementSection
- *
- */
-public class SimpleCSMasterTreeSection extends TreeSection implements ICSMaster {
-
-	private static final int F_BUTTON_ADD_STEP = 0;
-
-	private static final int F_BUTTON_ADD_SUBSTEP = 1;
-
-	private static final int F_BUTTON_REMOVE = 4;
-
-	private static final int F_BUTTON_UP = 5;
-
-	private static final int F_BUTTON_DOWN = 6;
-
-	private static final int F_BUTTON_PREVIEW = 9;
-
-	private static final int F_UP_FLAG = -1;
-
-	private static final int F_DOWN_FLAG = 1;
-
-	private TreeViewer fTreeViewer;
-
-	private ISimpleCSModel fModel;
-
-	private SimpleCSAddStepAction fAddStepAction;
-
-	private SimpleCSRemoveStepAction fRemoveStepAction;
-
-	private SimpleCSRemoveSubStepAction fRemoveSubStepAction;
-
-	private SimpleCSAddSubStepAction fAddSubStepAction;
-
-	private SimpleCSRemoveRunObjectAction fRemoveRunObjectAction;
-
-	private CollapseAction fCollapseAction;
-
-	private ControlDecoration fSubStepInfoDecoration;
-
-	/**
-	 * @param formPage
-	 * @param parent
-	 * @param style
-	 * @param buttonLabels
-	 */
-	public SimpleCSMasterTreeSection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, new String[] {SimpleMessages.SimpleCSMasterTreeSection_addStep, SimpleMessages.SimpleCSMasterTreeSection_addSubStep, null, null, SimpleMessages.SimpleCSMasterTreeSection_remove, SimpleMessages.SimpleCSMasterTreeSection_up, SimpleMessages.SimpleCSMasterTreeSection_down, null, null, SimpleMessages.SimpleCSMasterTreeSection_preview});
-
-		// Create actions
-		fAddStepAction = new SimpleCSAddStepAction();
-		fRemoveStepAction = new SimpleCSRemoveStepAction();
-		fRemoveSubStepAction = new SimpleCSRemoveSubStepAction();
-		fAddSubStepAction = new SimpleCSAddSubStepAction();
-		fRemoveRunObjectAction = new SimpleCSRemoveRunObjectAction();
-		fCollapseAction = null;
-	}
-
-	/* (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) {
-		// Get the model
-		fModel = (ISimpleCSModel) getPage().getModel();
-		// Set section title 
-		section.setText(SimpleMessages.SimpleCSMasterTreeSection_sectionTitle);
-		// Set section description
-		section.setDescription(SimpleMessages.SimpleCSMasterTreeSection_sectionDescription);
-		// Create section client
-		Composite container = createClientContainer(section, 2, toolkit);
-		createTree(container, toolkit);
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		// Create section toolbar
-		createSectionToolbar(section, toolkit);
-	}
-
-	/**
-	 * @param section
-	 * @param toolkit
-	 */
-	private void createSectionToolbar(Section section, FormToolkit toolkit) {
-
-		ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
-		ToolBar toolbar = toolBarManager.createControl(section);
-		final Cursor handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
-		toolbar.setCursor(handCursor);
-		// Cursor needs to be explicitly disposed
-		toolbar.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if ((handCursor != null) && (handCursor.isDisposed() == false)) {
-					handCursor.dispose();
-				}
-			}
-		});
-		// Add collapse action to the tool bar
-		fCollapseAction = new CollapseAction(fTreeViewer, SimpleMessages.SimpleCSMasterTreeSection_collapseAll, 1, fModel.getSimpleCS());
-		toolBarManager.add(fCollapseAction);
-
-		toolBarManager.update(true);
-
-		section.setTextClient(toolbar);
-	}
-
-	/**
-	 * 
-	 */
-	private void initializeTreeViewer() {
-		ISelection selection = fTreeViewer.getSelection();
-		if (fModel == null) {
-			return;
-		}
-		fTreeViewer.setInput(fModel);
-
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_STEP, fModel.isEditable());
-		// Set to false because initial node selected is the root cheatsheet node
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_SUBSTEP, false);
-		// Set to false because initial node selected is the root cheatsheet node
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, false);
-		// Set to false because initial node selected is the root cheatsheet node
-		getTreePart().setButtonEnabled(F_BUTTON_UP, false);
-		// Set to false because initial node selected is the root cheatsheet node
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, false);
-		getTreePart().setButtonEnabled(F_BUTTON_PREVIEW, true);
-
-		//ISimpleCS cheatsheet = fModel.getSimpleCS();
-		// Select the cheatsheet node in the tree
-		//fTreeViewer.setSelection(new StructuredSelection(cheatsheet), true);
-		//fTreeViewer.expandToLevel(2);
-		fTreeViewer.setSelection(selection, true);
-	}
-
-	/**
-	 * @param container
-	 * @param toolkit
-	 */
-	private void createTree(Composite container, FormToolkit toolkit) {
-		TreePart treePart = getTreePart();
-		createViewerPartControl(container, SWT.SINGLE, 2, toolkit);
-		fTreeViewer = treePart.getTreeViewer();
-		fTreeViewer.setContentProvider(new SimpleCSContentProvider());
-		fTreeViewer.setLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-		PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().connect(this);
-		createTreeListeners();
-		createSubStepInfoDecoration();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#isDragAndDropEnabled()
-	 */
-	protected boolean isDragAndDropEnabled() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canDragMove(java.lang.Object[])
-	 */
-	public boolean canDragMove(Object[] sourceObjects) {
-		// Validate source objects
-		if (validatePaste(sourceObjects) == false) {
-			return false;
-		}
-		ISelection selection = new StructuredSelection(sourceObjects);
-		return canCut(selection);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canDropMove(java.lang.Object, java.lang.Object[], int)
-	 */
-	public boolean canDropMove(Object targetObject, Object[] sourceObjects, int targetLocation) {
-		// Validate arguments
-		if (validatePaste(targetObject, sourceObjects) == false) {
-			return false;
-		}
-		// Multi-select not supported
-		ISimpleCSObject sourceCSObject = (ISimpleCSObject) sourceObjects[0];
-		ISimpleCSObject targetCSObject = (ISimpleCSObject) targetObject;
-		// Objects have to be from the same model
-		ISimpleCSModel sourceModel = sourceCSObject.getModel();
-		ISimpleCSModel targetModel = targetCSObject.getModel();
-		if (sourceModel.equals(targetModel) == false) {
-			return false;
-		}
-		// Validate move
-		if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			ISimpleCSItem sourceItem = (ISimpleCSItem) sourceCSObject;
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-				// Source:  Item
-				// Target:  Cheat Sheet
-				ISimpleCS targetCheatSheet = (ISimpleCS) targetCSObject;
-				return canDropMove(targetCheatSheet, sourceItem, targetLocation);
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				// Source:  Item
-				// Target:  Item
-				ISimpleCSItem targetItem = (ISimpleCSItem) targetCSObject;
-				return canDropMove(targetItem, sourceItem, targetLocation);
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_INTRO) {
-				// Source:  Item
-				// Target:  Intro
-				ISimpleCSIntro targetIntro = (ISimpleCSIntro) targetCSObject;
-				return canDropMove(targetIntro, sourceItem, targetLocation);
-			}
-		} else if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			ISimpleCSSubItem sourceSubItem = (ISimpleCSSubItem) sourceCSObject;
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				// Source:  SubItem
-				// Target:  Item
-				ISimpleCSItem targetItem = (ISimpleCSItem) targetCSObject;
-				return canDropMove(targetItem, sourceSubItem, targetLocation);
-			} else if ((targetCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) && (targetCSObject.getParent().getType() == ISimpleCSConstants.TYPE_ITEM)) {
-				// Source:  SubItem
-				// Target:  SubItem
-				ISimpleCSSubItem targetSubItem = (ISimpleCSSubItem) targetCSObject;
-				return canDropMove(targetSubItem, sourceSubItem, targetLocation);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param targetCheatSheet
-	 * @param sourceItem
-	 * @param targetLocation
-	 * @return
-	 */
-	private boolean canDropMove(ISimpleCS targetCheatSheet, ISimpleCSItem sourceItem, int targetLocation) {
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			return false;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_AFTER) {
-			return false;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			if (targetCheatSheet.isLastItem(sourceItem)) {
-				return false;
-			}
-			// Paste item as last child of cheat sheet root 
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param targetItem
-	 * @param sourceItem
-	 * @param targetLocation
-	 * @return
-	 */
-	private boolean canDropMove(ISimpleCSItem targetItem, ISimpleCSItem sourceItem, int targetLocation) {
-		ISimpleCS parent = targetItem.getSimpleCS();
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			IDocumentElementNode previousNode = parent.getPreviousSibling(targetItem, ISimpleCSItem.class);
-			if (sourceItem.equals(previousNode)) {
-				return false;
-			}
-			// Paste item as sibling of item (before)
-			return true;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_AFTER) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetItem, ISimpleCSItem.class);
-			if (sourceItem.equals(nextNode)) {
-				return false;
-			}
-			// Paste item as sibling of item (after)
-			return true;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetItem, ISimpleCSItem.class);
-			if (sourceItem.equals(nextNode)) {
-				return false;
-			}
-			// Paste item as sibling of item (after)
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param targetIntro
-	 * @param sourceItem
-	 * @param targetLocation
-	 * @return
-	 */
-	private boolean canDropMove(ISimpleCSIntro targetIntro, ISimpleCSItem sourceItem, int targetLocation) {
-		ISimpleCS parent = targetIntro.getSimpleCS();
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			return false;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_AFTER) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetIntro, ISimpleCSItem.class);
-			if (sourceItem.equals(nextNode)) {
-				return false;
-			}
-			// Paste item as sibling of intro (first item child of cheat sheet after intro)
-			return true;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetIntro, ISimpleCSItem.class);
-			if (sourceItem.equals(nextNode)) {
-				return false;
-			}
-			// Paste item as sibling of intro (first item child of cheat sheet after intro)
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param targetItem
-	 * @param sourceSubItem
-	 * @param targetLocation
-	 * @return
-	 */
-	private boolean canDropMove(ISimpleCSItem targetItem, ISimpleCSSubItem sourceSubItem, int targetLocation) {
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			return false;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_AFTER) {
-			if (targetItem.getExecutable() != null) {
-				return false;
-			} else if (targetItem.isFirstSubItem(sourceSubItem)) {
-				return false;
-			}
-			// Paste subitem as the first child of item 
-			return true;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			if (targetItem.getExecutable() != null) {
-				return false;
-			} else if (targetItem.isLastSubItem(sourceSubItem)) {
-				return false;
-			}
-			// Paste subitem as the last child of item 
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param targetSubItem
-	 * @param sourceSubItem
-	 * @param targetLocation
-	 * @return
-	 */
-	private boolean canDropMove(ISimpleCSSubItem targetSubItem, ISimpleCSSubItem sourceSubItem, int targetLocation) {
-		ISimpleCSItem parent = (ISimpleCSItem) targetSubItem.getParent();
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			IDocumentElementNode previousNode = parent.getPreviousSibling(targetSubItem, ISimpleCSSubItem.class);
-			if (sourceSubItem.equals(previousNode)) {
-				return false;
-			}
-			// Paste subitem as sibling of subitem (before)
-			return true;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_AFTER) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetSubItem, ISimpleCSSubItem.class);
-			if (sourceSubItem.equals(nextNode)) {
-				return false;
-			}
-			// Paste subitem as sibling of subitem (after)
-			return true;
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetSubItem, ISimpleCSSubItem.class);
-			if (sourceSubItem.equals(nextNode)) {
-				return false;
-			}
-			// Paste subitem as sibling of subitem (after)
-			return true;
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doDropMove(java.lang.Object, java.lang.Object[], int)
-	 */
-	public void doDropMove(Object targetObject, Object[] sourceObjects, int targetLocation) {
-		// Validate arguments
-		if (validatePaste(targetObject, sourceObjects) == false) {
-			Display.getDefault().beep();
-			return;
-		}
-		// Multi-select not supported
-		ISimpleCSObject sourceCSObject = (ISimpleCSObject) sourceObjects[0];
-		ISimpleCSObject targetCSObject = (ISimpleCSObject) targetObject;
-		// Validate move
-		if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			ISimpleCSItem sourceItem = (ISimpleCSItem) sourceCSObject;
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-				// Source:  Item
-				// Target:  Cheat Sheet
-				ISimpleCS targetCheatSheet = (ISimpleCS) targetCSObject;
-				doDropMove(targetCheatSheet, sourceItem, targetLocation);
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				// Source:  Item
-				// Target:  Item
-				ISimpleCSItem targetItem = (ISimpleCSItem) targetCSObject;
-				doDropMove(targetItem, sourceItem, targetLocation);
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_INTRO) {
-				// Source:  Item
-				// Target:  Intro
-				ISimpleCSIntro targetIntro = (ISimpleCSIntro) targetCSObject;
-				doDropMove(targetIntro, sourceItem, targetLocation);
-			}
-		} else if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			ISimpleCSSubItem sourceSubItem = (ISimpleCSSubItem) sourceCSObject;
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				// Source:  SubItem
-				// Target:  Item
-				ISimpleCSItem targetItem = (ISimpleCSItem) targetCSObject;
-				doDropMove(targetItem, sourceSubItem, targetLocation);
-			} else if ((targetCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) && (targetCSObject.getParent().getType() == ISimpleCSConstants.TYPE_ITEM)) {
-				// Source:  SubItem
-				// Target:  SubItem
-				ISimpleCSSubItem targetSubItem = (ISimpleCSSubItem) targetCSObject;
-				doDropMove(targetSubItem, sourceSubItem, targetLocation);
-			}
-		}
-	}
-
-	/**
-	 * @param targetCheatSheet
-	 * @param sourceItem
-	 * @param targetLocation
-	 */
-	private void doDropMove(ISimpleCS targetCheatSheet, ISimpleCSItem sourceItem, int targetLocation) {
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			// NO-OP, not legal
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_AFTER) {
-			// NO-OP, not legal
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			if (targetCheatSheet.isLastItem(sourceItem)) {
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceItem.reconnect(targetCheatSheet, fModel);
-			// Paste item as the last child of cheat sheet root 
-			targetCheatSheet.addItem(sourceItem);
-		}
-	}
-
-	/**
-	 * @param targetItem
-	 * @param sourceItem
-	 * @param targetLocation
-	 */
-	private void doDropMove(ISimpleCSItem targetItem, ISimpleCSItem sourceItem, int targetLocation) {
-		ISimpleCS parent = targetItem.getSimpleCS();
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			IDocumentElementNode previousNode = parent.getPreviousSibling(targetItem, ISimpleCSItem.class);
-			if (sourceItem.equals(previousNode)) {
-				// NO-OP, not legal
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceItem.reconnect(parent, fModel);
-			// Get index of target item
-			int index = parent.indexOfItem(targetItem);
-			// Paste item as sibling of item (before) 
-			if (index != -1) {
-				parent.addItem(index, sourceItem);
-			}
-		} else if ((targetLocation == ViewerDropAdapter.LOCATION_AFTER) || (targetLocation == ViewerDropAdapter.LOCATION_ON)) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetItem, ISimpleCSItem.class);
-			if (sourceItem.equals(nextNode)) {
-				// NO-OP, not legal
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceItem.reconnect(parent, fModel);
-
-			if (nextNode == null) {
-				parent.addItem(sourceItem);
-			} else {
-				// Get index of target item
-				int index = parent.indexOfItem((ISimpleCSItem) nextNode);
-				// Paste item as sibling of item (after)
-				if (index != -1) {
-					parent.addItem(index, sourceItem);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param targetIntro
-	 * @param sourceItem
-	 * @param targetLocation
-	 */
-	private void doDropMove(ISimpleCSIntro targetIntro, ISimpleCSItem sourceItem, int targetLocation) {
-		ISimpleCS parent = targetIntro.getSimpleCS();
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			// NO-OP, not legal
-		} else if ((targetLocation == ViewerDropAdapter.LOCATION_AFTER) || (targetLocation == ViewerDropAdapter.LOCATION_ON)) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetIntro, ISimpleCSItem.class);
-			if (sourceItem.equals(nextNode)) {
-				// NO-OP, not legal
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceItem.reconnect(parent, fModel);
-			if (nextNode == null) {
-				parent.addItem(sourceItem);
-			} else {
-				// Get index of target item
-				int index = parent.indexOfItem((ISimpleCSItem) nextNode);
-				// Paste item as sibling of intro (first item child of cheat sheet after intro)
-				if (index != -1) {
-					parent.addItem(index, sourceItem);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param targetItem
-	 * @param sourceSubItem
-	 * @param targetLocation
-	 */
-	private void doDropMove(ISimpleCSItem targetItem, ISimpleCSSubItem sourceSubItem, int targetLocation) {
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			// NO-OP, not legal
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_AFTER) {
-			if (targetItem.getExecutable() != null) {
-				return;
-			} else if (targetItem.isFirstSubItem(sourceSubItem)) {
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceSubItem.reconnect(targetItem, fModel);
-			// Get the item's first subitem child
-			ISimpleCSSubItem firstSubItem = (ISimpleCSSubItem) targetItem.getChildNode(ISimpleCSSubItem.class);
-			// Paste subitem as the first child of item
-			if (firstSubItem == null) {
-				targetItem.addSubItem(sourceSubItem);
-			} else {
-				int index = targetItem.indexOfSubItem(firstSubItem);
-				// Paste subitem as the first child of item
-				if (index != -1) {
-					targetItem.addSubItem(index, sourceSubItem);
-				}
-			}
-		} else if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			if (targetItem.getExecutable() != null) {
-				return;
-			} else if (targetItem.isLastSubItem(sourceSubItem)) {
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceSubItem.reconnect(targetItem, fModel);
-			// Paste subitem as the last child of item
-			targetItem.addSubItem(sourceSubItem);
-		}
-	}
-
-	/**
-	 * @param targetSubItem
-	 * @param sourceSubItem
-	 * @param targetLocation
-	 */
-	private void doDropMove(ISimpleCSSubItem targetSubItem, ISimpleCSSubItem sourceSubItem, int targetLocation) {
-		ISimpleCSItem parent = (ISimpleCSItem) targetSubItem.getParent();
-		if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-			IDocumentElementNode previousNode = parent.getPreviousSibling(targetSubItem, ISimpleCSSubItem.class);
-			if (sourceSubItem.equals(previousNode)) {
-				// NO-OP, not legal
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceSubItem.reconnect(parent, fModel);
-			// Get index of target item
-			int index = parent.indexOfSubItem(targetSubItem);
-			// Paste item as sibling of item (before) 
-			if (index != -1) {
-				parent.addSubItem(index, sourceSubItem);
-			}
-		} else if ((targetLocation == ViewerDropAdapter.LOCATION_AFTER) || (targetLocation == ViewerDropAdapter.LOCATION_ON)) {
-			IDocumentElementNode nextNode = parent.getNextSibling(targetSubItem, ISimpleCSSubItem.class);
-			if (sourceSubItem.equals(nextNode)) {
-				// NO-OP, not legal
-				return;
-			}
-			// Adjust all the source object transient field values to
-			// acceptable values
-			sourceSubItem.reconnect(parent, fModel);
-
-			if (nextNode == null) {
-				parent.addSubItem(sourceSubItem);
-			} else {
-				// Get index of target item
-				int index = parent.indexOfSubItem((ISimpleCSSubItem) nextNode);
-				// Paste item as sibling of item (after)
-				if (index != -1) {
-					parent.addSubItem(index, sourceSubItem);
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doDragRemove(java.lang.Object[])
-	 */
-	public void doDragRemove(Object[] sourceObjects) {
-		// Validate source objects
-		if (validatePaste(sourceObjects) == false) {
-			return;
-		}
-		ISimpleCSObject object = (ISimpleCSObject) sourceObjects[0];
-		// Remove the object from the model
-		if (object.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			ISimpleCSItem item = (ISimpleCSItem) object;
-			ISimpleCS cheatsheet = object.getSimpleCS();
-			doSelect(false);
-			cheatsheet.removeItem(item);
-			doSelect(true);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			ISimpleCSObject parent = object.getParent();
-			if (parent.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				ISimpleCSSubItem subitem = (ISimpleCSSubItem) object;
-				ISimpleCSItem item = ((ISimpleCSItem) parent);
-				doSelect(false);
-				item.removeSubItem(subitem);
-				doSelect(true);
-			}
-		}
-		// Applicable for move operations
-		// Flush the text edit operations associated with the move operation
-		// to the source page
-		// Move involves add new cloned object x and remove of original object
-		// x 
-		// Without flushing, multiple move operations up and down cause the
-		// text edit operations to get completely screwed up (e.g. mark-up
-		// in wrong position or getting lost)
-		// TODO: MP: Undo: What are the implications of this?
-		((PDEFormEditor) getPage().getEditor()).getContextManager().getPrimaryContext().flushEditorInput();
-	}
-
-	/**
-	 * 
-	 */
-	private void createSubStepInfoDecoration() {
-		//
-		Button button = getStructuredViewerPart().getButton(F_BUTTON_ADD_SUBSTEP);
-		int bits = SWT.TOP | SWT.RIGHT;
-		fSubStepInfoDecoration = new ControlDecoration(button, bits);
-		fSubStepInfoDecoration.setMarginWidth(0);
-		updateSubStepInfoDecoration(false, false, false);
-		fSubStepInfoDecoration.setImage(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_INFORMATION).getImage());
-	}
-
-	/**
-	 * @param show
-	 * @param itemHasNoExecutable
-	 * @param itemIsNotOptional
-	 */
-	private void updateSubStepInfoDecoration(boolean show, boolean itemHasNoExecutable, boolean itemIsNotOptional) {
-		//
-		if (show) {
-			fSubStepInfoDecoration.show();
-			if (itemHasNoExecutable == false) {
-				fSubStepInfoDecoration.setDescriptionText(SimpleMessages.SimpleCSMasterTreeSection_descriptionText1);
-			} else if (itemIsNotOptional == false) {
-				fSubStepInfoDecoration.setDescriptionText(SimpleMessages.SimpleCSMasterTreeSection_descriptionText2);
-			}
-		} else {
-			fSubStepInfoDecoration.hide();
-		}
-		fSubStepInfoDecoration.setShowHover(show);
-	}
-
-	/**
-	 * 
-	 */
-	private void createTreeListeners() {
-		// Create listener for the outline view 'link with editor' toggle 
-		// button
-		fTreeViewer.addPostSelectionChangedListener(getPage().getPDEEditor().new PDEFormEditorChangeListener());
-	}
-
-	/**
-	 * @return
-	 */
-	public ISelection getSelection() {
-		return fTreeViewer.getSelection();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#buttonSelected(int)
-	 */
-	protected void buttonSelected(int index) {
-		switch (index) {
-			case F_BUTTON_ADD_STEP :
-				handleAddStepAction();
-				break;
-			case F_BUTTON_ADD_SUBSTEP :
-				handleAddSubStepAction();
-				break;
-			case F_BUTTON_REMOVE :
-				handleDeleteAction();
-				break;
-			case F_BUTTON_UP :
-				handleMoveStepAction(F_UP_FLAG);
-				break;
-			case F_BUTTON_DOWN :
-				handleMoveStepAction(F_DOWN_FLAG);
-				break;
-			case F_BUTTON_PREVIEW :
-				handlePreviewAction();
-				break;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void selectionChanged(IStructuredSelection selection) {
-		// Update global selection used by source page to sychronize selections
-		// made in the master tree viewer with elements in the source view
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-
-	/**
-	 * 
-	 */
-	public void updateButtons() {
-		if (!fModel.isEditable()) {
-			return;
-		}
-		ISimpleCSObject csObject = getCurrentSelection();
-
-		boolean canAddItem = false;
-		boolean canAddSubItem = false;
-		boolean canRemove = false;
-		boolean canMoveUp = false;
-		boolean canMoveDown = false;
-
-		boolean itemHasNoExecutable = false;
-		boolean itemIsNotOptional = false;
-		boolean showDecoration = false;
-
-		if (csObject != null) {
-
-			if (csObject.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-				// Add item to end of cheat sheet child items
-				canAddItem = true;
-			} else if (csObject.getType() == ISimpleCSConstants.TYPE_INTRO) {
-				// Add item as the first cheat sheet child item
-				// which is right after the introduction node
-				canAddItem = true;
-			} else if (csObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				ISimpleCSItem item = (ISimpleCSItem) csObject;
-				if (item.getSimpleCS().isFirstItem(item) == false) {
-					canMoveUp = true;
-				}
-				if (item.getSimpleCS().isLastItem(item) == false) {
-					canMoveDown = true;
-				}
-
-				// Preserve cheat sheet validity
-				// Semantic Rule:  Cannot have a cheat sheet with no items
-				if (item.getSimpleCS().getItemCount() > 1) {
-					canRemove = true;
-				}
-
-				// Preserve cheat sheet validity
-				// Semantic Rule:  Cannot have a subitem and any of the following
-				// together:  perform-when, command, action
-				// Preserve cheat sheet validity
-				// Semantic Rule:  Cannot add subitems to an item that is 
-				// optional		
-				itemHasNoExecutable = (item.getExecutable() == null);
-				itemIsNotOptional = (item.getSkip() == false);
-				if (itemHasNoExecutable && itemIsNotOptional) {
-					canAddSubItem = true;
-				}
-				showDecoration = (canAddSubItem == false);
-				// Add item right after this item
-				canAddItem = true;
-
-			} else if (csObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-				ISimpleCSSubItem subitem = (ISimpleCSSubItem) csObject;
-				ISimpleCSObject parent = subitem.getParent();
-				if (parent.getType() == ISimpleCSConstants.TYPE_ITEM) {
-					ISimpleCSItem item = (ISimpleCSItem) parent;
-					if (item.isFirstSubItem(subitem) == false) {
-						canMoveUp = true;
-					}
-					if (item.isLastSubItem(subitem) == false) {
-						canMoveDown = true;
-					}
-					// Preserve cheat sheet validity
-					// Semantic Rule:  Cannot have a subitem and any of the following
-					// together:  perform-when, command, action
-					// Preserve cheat sheet validity
-					// Semantic Rule:  Cannot add subitems to an item that is 
-					// optional				
-					itemHasNoExecutable = (item.getExecutable() == null);
-					itemIsNotOptional = (item.getSkip() == false);
-					if (itemHasNoExecutable && itemIsNotOptional) {
-						canAddSubItem = true;
-					}
-					showDecoration = (canAddSubItem == false);
-				}
-				canRemove = true;
-
-			} else if ((csObject.getType() == ISimpleCSConstants.TYPE_REPEATED_SUBITEM) || (csObject.getType() == ISimpleCSConstants.TYPE_CONDITIONAL_SUBITEM) || (csObject.getType() == ISimpleCSConstants.TYPE_PERFORM_WHEN) || (csObject.getType() == ISimpleCSConstants.TYPE_ACTION) || (csObject.getType() == ISimpleCSConstants.TYPE_COMMAND)) {
-				// Specifically for perform-when, repeated-subitem, 
-				// conditional-subitem edge cases
-				// Action and command supported; but, will never be applicable
-				canRemove = true;
-			}
-
-			updateSubStepInfoDecoration(showDecoration, itemHasNoExecutable, itemIsNotOptional);
-		}
-
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_STEP, canAddItem);
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_SUBSTEP, canAddSubItem);
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, canRemove);
-		getTreePart().setButtonEnabled(F_BUTTON_UP, canMoveUp);
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, canMoveDown);
-	}
-
-	/**
-	 * 
-	 */
-	private void handleAddStepAction() {
-		// Get the current selection
-		ISimpleCSObject csObject = getCurrentSelection();
-		// If nothing is selected add to the root cheat sheet node
-		if (csObject == null) {
-			fAddStepAction.setDataObject(fModel.getSimpleCS());
-		} else {
-			fAddStepAction.setDataObject(csObject);
-		}
-		// Execute the action
-		fAddStepAction.run();
-	}
-
-	/**
-	 * @return
-	 */
-	private ISimpleCSObject getCurrentSelection() {
-		ISelection selection = fTreeViewer.getSelection();
-		Object object = ((IStructuredSelection) selection).getFirstElement();
-		return (ISimpleCSObject) object;
-	}
-
-	/**
-	 * 
-	 */
-	private void handleAddSubStepAction() {
-		// Get the current selection
-		ISimpleCSObject csObject = getCurrentSelection();
-		// Ensure the selection is defined
-		if (csObject == null) {
-			return;
-		}
-		// Set the selection object to operate on
-		fAddSubStepAction.setDataObject(csObject);
-		// Execute the action
-		fAddSubStepAction.run();
-	}
-
-	/**
-	 * 
-	 */
-	private void handleMoveStepAction(int positionFlag) {
-		ISimpleCSObject object = getCurrentSelection();
-		if (object != null) {
-			if (object instanceof ISimpleCSItem) {
-				ISimpleCSItem item = (ISimpleCSItem) object;
-				item.getSimpleCS().moveItem(item, positionFlag);
-			} else if (object instanceof ISimpleCSSubItem) {
-				ISimpleCSSubItem subitem = (ISimpleCSSubItem) object;
-				// Get the current index of the subitem
-				ISimpleCSObject parent = subitem.getParent();
-				if (parent.getType() == ISimpleCSConstants.TYPE_ITEM) {
-					ISimpleCSItem item = (ISimpleCSItem) parent;
-					item.moveSubItem(subitem, positionFlag);
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void handlePreviewAction() {
-		// Get the editor
-		PDEFormEditor editor = (PDEFormEditor) getPage().getEditor();
-		// Get the form editor contributor
-		SimpleCSEditorContributor contributor = (SimpleCSEditorContributor) editor.getContributor();
-		// Get the preview action
-		SimpleCSPreviewAction previewAction = contributor.getPreviewAction();
-		// Set the cheat sheet object
-		previewAction.setDataModelObject(fModel.getSimpleCS());
-		// Set the editor input
-		previewAction.setEditorInput(getPage().getEditorInput());
-		// Run the preview action
-		previewAction.run();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// No need to call super, world changed event handled here
-
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			handleModelEventWorldChanged(event);
-		} else if (event.getChangeType() == IModelChangedEvent.INSERT) {
-			handleModelInsertType(event);
-		} else if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-			handleModelRemoveType(event);
-		} else if ((event.getChangeType() == IModelChangedEvent.CHANGE) && (event.getChangedProperty().equals(IDocumentElementNode.F_PROPERTY_CHANGE_TYPE_SWAP))) {
-			handleModelChangeTypeSwap(event);
-		} else if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			handleModelChangeType(event);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
-	 */
-	public void refresh() {
-		// Get the form page
-		SimpleCSDefinitionPage page = (SimpleCSDefinitionPage) getPage();
-		// Replace the current dirty model with the model reloaded from
-		// file
-		fModel = (ISimpleCSModel) page.getModel();
-		// Re-initialize the tree viewer.  Makes a details page selection
-		initializeTreeViewer();
-
-		super.refresh();
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelEventWorldChanged(IModelChangedEvent event) {
-		// Section will be updated on refresh
-		markStale();
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelChangeTypeSwap(IModelChangedEvent event) {
-		// Swap event
-		Object[] objects = event.getChangedObjects();
-		// Ensure right type
-		if ((objects[0] instanceof ISimpleCSObject) == false) {
-			return;
-		}
-		ISimpleCSObject object = (ISimpleCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-		} else if ((object.getType() == ISimpleCSConstants.TYPE_ITEM) || (object.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET)) {
-			// Refresh the element
-			fTreeViewer.refresh(object);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelInsertType(IModelChangedEvent event) {
-		// Insert event
-		Object[] objects = event.getChangedObjects();
-		ISimpleCSObject object = (ISimpleCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-		} else if ((object.getType() == ISimpleCSConstants.TYPE_ITEM) || (object.getType() == ISimpleCSConstants.TYPE_SUBITEM)) {
-			// Refresh the parent element in the tree viewer
-			fTreeViewer.refresh(object.getParent());
-			// Select the new item in the tree
-			fTreeViewer.setSelection(new StructuredSelection(object), true);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelRemoveType(IModelChangedEvent event) {
-		// Remove event
-		Object[] objects = event.getChangedObjects();
-		ISimpleCSObject object = (ISimpleCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-		} else if (object.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			// Remove the item
-			fTreeViewer.remove(object);
-			// Determine if we should make a selection
-			if (canSelect() == false) {
-				return;
-			}
-			// Select the appropriate object
-			ISimpleCSObject csObject = fRemoveStepAction.getObjectToSelect();
-			if (csObject == null) {
-				csObject = object.getParent();
-			}
-			fTreeViewer.setSelection(new StructuredSelection(csObject), true);
-		} else if (object.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			// Remove the subitem
-			fTreeViewer.remove(object);
-			// Determine if we should make a selection
-			if (canSelect() == false) {
-				return;
-			}
-			// Select the appropriate object
-			ISimpleCSObject csObject = fRemoveSubStepAction.getObjectToSelect();
-			if (csObject == null) {
-				csObject = object.getParent();
-			}
-			fTreeViewer.setSelection(new StructuredSelection(csObject), true);
-		} else if ((object.getType() == ISimpleCSConstants.TYPE_CONDITIONAL_SUBITEM) || (object.getType() == ISimpleCSConstants.TYPE_REPEATED_SUBITEM) || (object.getType() == ISimpleCSConstants.TYPE_PERFORM_WHEN)) {
-			// Remove the object
-			fTreeViewer.remove(object);
-			// Select the parent in the tree
-			fTreeViewer.setSelection(new StructuredSelection(object.getParent()), true);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelChangeType(IModelChangedEvent event) {
-		// Change event
-		Object[] objects = event.getChangedObjects();
-		// Ensure right type
-		if ((objects[0] instanceof ISimpleCSObject) == false) {
-			return;
-		}
-		ISimpleCSObject object = (ISimpleCSObject) objects[0];
-		if (object == null) {
-			// Ignore
-		} else if ((object.getType() == ISimpleCSConstants.TYPE_ITEM) || (object.getType() == ISimpleCSConstants.TYPE_SUBITEM) || (object.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET)) {
-			// Refresh the element in the tree viewer
-			fTreeViewer.update(object, null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.ICSMaster#fireSelection()
-	 */
-	public void fireSelection() {
-		fTreeViewer.setSelection(fTreeViewer.getSelection());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		// Get the current selection
-		ISimpleCSObject csObject = getCurrentSelection();
-		// Create the "New" submenu
-		MenuManager submenu = new MenuManager(SimpleMessages.SimpleCSMasterTreeSection_new);
-		// Add the "New" submenu to the main context menu
-		manager.add(submenu);
-		if ((csObject == null) || (csObject.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET)) {
-			// Add to the "New" submenu
-			// Add step action
-			fAddStepAction.setDataObject(fModel.getSimpleCS());
-			fAddStepAction.setEnabled(fModel.isEditable());
-			submenu.add(fAddStepAction);
-		} else if (csObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			ISimpleCSItem item = (ISimpleCSItem) csObject;
-			// Add to the "New" submenu
-			// Add sub-step action
-			fAddSubStepAction.setDataObject(csObject);
-			// Preserve cheat sheet validity
-			// Semantic Rule:  Cannot have a subitem and any of the following
-			// together:  perform-when, command, action			
-			// Preserve cheat sheet validity
-			// Semantic Rule:  Cannot add subitems to an item that is 
-			// optional				
-			if ((item.getExecutable() == null) && (item.getSkip() == false)) {
-				fAddSubStepAction.setEnabled(fModel.isEditable());
-			} else {
-				fAddSubStepAction.setEnabled(false);
-			}
-			submenu.add(fAddSubStepAction);
-			// Add to the main context menu
-			// Add a separator to the main context menu
-			manager.add(new Separator());
-			// Delete step action
-			fRemoveStepAction.setItem((ISimpleCSItem) csObject);
-			// Preserve cheat sheet validity
-			// Semantic Rule:  Cannot have a cheat sheet with no items
-			if (item.getSimpleCS().getItemCount() > 1) {
-				fRemoveStepAction.setEnabled(fModel.isEditable());
-			} else {
-				fRemoveStepAction.setEnabled(false);
-			}
-			manager.add(fRemoveStepAction);
-		} else if ((csObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) || (csObject.getType() == ISimpleCSConstants.TYPE_REPEATED_SUBITEM) || (csObject.getType() == ISimpleCSConstants.TYPE_CONDITIONAL_SUBITEM)) {
-			// Add to the main context menu
-			// Add a separator to the main context menu
-			manager.add(new Separator());
-			// Delete sub-step action
-			fRemoveSubStepAction.setSubItem((ISimpleCSSubItemObject) csObject);
-			fRemoveSubStepAction.setEnabled(fModel.isEditable());
-			manager.add(fRemoveSubStepAction);
-		} else if ((csObject.getType() == ISimpleCSConstants.TYPE_PERFORM_WHEN) || (csObject.getType() == ISimpleCSConstants.TYPE_ACTION) || (csObject.getType() == ISimpleCSConstants.TYPE_COMMAND)) {
-			// Specifically for perform-when edge case
-			// Action and command supported; but, will never be applicable
-			// Add to the main context menu
-			// Add a separator to the main context menu
-			manager.add(new Separator());
-			// Delete run object action
-			fRemoveRunObjectAction.setRunObject((ISimpleCSRunContainerObject) csObject);
-			fRemoveRunObjectAction.setEnabled(fModel.isEditable());
-			manager.add(fRemoveRunObjectAction);
-		}
-		// Add clipboard operations
-		manager.add(new Separator());
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		// Ensure model is editable
-		if (isEditable() == false) {
-			return false;
-		} else if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleDeleteAction();
-			return true;
-		} else if (actionId.equals(ActionFactory.CUT.getId())) {
-			// Handle the delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDeleteAction();
-			return false;
-		} else if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param object
-	 */
-	private void handleDeleteAction() {
-		ISimpleCSObject object = getCurrentSelection();
-		if (object != null) {
-			if (object instanceof ISimpleCSItem) {
-				ISimpleCSItem item = (ISimpleCSItem) object;
-				// Preserve cheat sheet validity
-				// Semantic Rule:  Cannot have a cheat sheet with no items
-				if (item.getSimpleCS().getItemCount() > 1) {
-					fRemoveStepAction.setItem(item);
-					fRemoveStepAction.run();
-				} else {
-					// Produce audible beep
-					Display.getCurrent().beep();
-				}
-			} else if (object instanceof ISimpleCSSubItemObject) {
-				fRemoveSubStepAction.setSubItem((ISimpleCSSubItemObject) object);
-				fRemoveSubStepAction.run();
-			} else if (object instanceof ISimpleCSRunContainerObject) {
-				// Specifically for perform-when edge case
-				// Action and command supported; but, will never be applicable
-				fRemoveRunObjectAction.setRunObject((ISimpleCSRunContainerObject) object);
-				fRemoveRunObjectAction.run();
-			} else if (object instanceof ISimpleCS) {
-				// Preserve cheat sheet validity
-				// Semantic Rule:  Cannot have a cheat sheet with no root
-				// cheatsheet node
-				// Produce audible beep
-				Display.getCurrent().beep();
-			} else if (object instanceof ISimpleCSIntro) {
-				// Preserve cheat sheet validity
-				// Semantic Rule:  Cannot have a cheat sheet with no 
-				// introduction
-				// Produce audible beep
-				Display.getCurrent().beep();
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#setFormInput(java.lang.Object)
-	 */
-	public boolean setFormInput(Object object) {
-		// This method allows the outline view to select items in the tree
-		// Invoked by
-		// org.eclipse.ui.forms.editor.IFormPage.selectReveal(Object object)
-		if (object instanceof ISimpleCSObject) {
-			// Select the item in the tree
-			fTreeViewer.setSelection(new StructuredSelection(object), true);
-			// Verify that something was actually selected
-			ISelection selection = fTreeViewer.getSelection();
-			if ((selection != null) && (selection.isEmpty() == false)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param targetObject
-	 * @param sourceObjects
-	 * @return
-	 */
-	private boolean validatePaste(Object targetObject, Object[] sourceObjects) {
-		// Validate target object
-		if ((targetObject instanceof ISimpleCSObject) == false) {
-			return false;
-		}
-		// Validate source objects
-		if (validatePaste(sourceObjects) == false) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @param sourceObjects
-	 * @return
-	 */
-	private boolean validatePaste(Object[] sourceObjects) {
-		// Validate source objects
-		if (sourceObjects == null) {
-			return false;
-		} else if (sourceObjects.length != 1) {
-			return false;
-		} else if ((sourceObjects[0] instanceof ISimpleCSObject) == false) {
-			return false;
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(java.lang.Object, java.lang.Object[])
-	 */
-	protected boolean canPaste(Object targetObject, Object[] sourceObjects) {
-		// Validate arguments
-		if (validatePaste(targetObject, sourceObjects) == false) {
-			return false;
-		}
-		// Multi-select not supported
-		ISimpleCSObject sourceCSObject = (ISimpleCSObject) sourceObjects[0];
-		ISimpleCSObject targetCSObject = (ISimpleCSObject) targetObject;
-		// Validate paste
-		if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-				// Paste item as child of cheat sheet root 
-				return true;
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				// Paste item as sibling of item
-				return true;
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_INTRO) {
-				// Paste item as sibling of intro (first item child of cheat sheet)
-				return true;
-			}
-		} else if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				// Paste subitem as child of item
-				return true;
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-				// Paste subitem as sibling of subitem
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(java.lang.Object, java.lang.Object[])
-	 */
-	protected void doPaste(Object targetObject, Object[] sourceObjects) {
-		// Validate arguments
-		if (validatePaste(targetObject, sourceObjects) == false) {
-			Display.getDefault().beep();
-			return;
-		}
-		// Multi-select not supported
-		ISimpleCSObject sourceCSObject = (ISimpleCSObject) sourceObjects[0];
-		ISimpleCSObject targetCSObject = (ISimpleCSObject) targetObject;
-		// Validate paste
-		if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			ISimpleCSItem sourceItem = (ISimpleCSItem) sourceCSObject;
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-				ISimpleCS targetCheatSheet = (ISimpleCS) targetCSObject;
-				// Adjust all the source object transient field values to
-				// acceptable values
-				sourceItem.reconnect(targetCheatSheet, fModel);
-				// Paste item as the last child of cheat sheet root 
-				targetCheatSheet.addItem(sourceItem);
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				ISimpleCSItem targetItem = (ISimpleCSItem) targetCSObject;
-				ISimpleCS targetCheatSheet = targetItem.getSimpleCS();
-				// Adjust all the source object transient field values to
-				// acceptable values
-				sourceItem.reconnect(targetCheatSheet, fModel);
-				// Paste source item as sibling of the target item (right after it)
-				int index = targetCheatSheet.indexOfItem(targetItem) + 1;
-				targetCheatSheet.addItem(index, sourceItem);
-			} else if (targetCSObject.getType() == ISimpleCSConstants.TYPE_INTRO) {
-				ISimpleCSIntro targetIntro = (ISimpleCSIntro) targetCSObject;
-				ISimpleCS targetCheatSheet = targetCSObject.getSimpleCS();
-				// Adjust all the source object transient field values to
-				// acceptable values
-				sourceItem.reconnect(targetCheatSheet, fModel);
-				// Paste source item as the first item (right after intro node)
-				int index = targetCheatSheet.indexOf(targetIntro) + 1;
-				targetCheatSheet.addItem(index, sourceItem);
-			}
-		} else if (sourceCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			ISimpleCSSubItem sourceSubitem = (ISimpleCSSubItem) sourceCSObject;
-			if (targetCSObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				ISimpleCSItem targetItem = (ISimpleCSItem) targetCSObject;
-				// Adjust all the source object transient field values to
-				// acceptable values
-				sourceSubitem.reconnect(targetItem, fModel);
-				// Paste subitem as the last child of the item 
-				targetItem.addSubItem(sourceSubitem);
-			} else if ((targetCSObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) && (targetCSObject.getParent().getType() == ISimpleCSConstants.TYPE_ITEM)) {
-				ISimpleCSSubItem targetSubItem = (ISimpleCSSubItem) targetCSObject;
-				ISimpleCSItem targetItem = (ISimpleCSItem) targetSubItem.getParent();
-				// Adjust all the source object transient field values to
-				// acceptable values
-				sourceSubitem.reconnect(targetItem, fModel);
-				// Paste source item as sibling of the target item (right after it)
-				int index = targetItem.indexOfSubItem(targetSubItem) + 1;
-				targetItem.addSubItem(index, sourceSubitem);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#canCut(org.eclipse.jface.viewers.ISelection)
-	 */
-	public boolean canCut(ISelection selection) {
-		// Validate selection
-		if (selection == null) {
-			return false;
-		} else if ((selection instanceof IStructuredSelection) == false) {
-			return false;
-		} else if (selection.isEmpty()) {
-			return false;
-		}
-		// Get the first element
-		Object object = ((IStructuredSelection) selection).getFirstElement();
-		// Ensure we have a CS object
-		if ((object instanceof ISimpleCSObject) == false) {
-			return false;
-		}
-		ISimpleCSObject csObject = (ISimpleCSObject) object;
-		// Can cut only items and subitems
-		if ((csObject.getType() == ISimpleCSConstants.TYPE_ITEM) && (csObject.getSimpleCS().getItemCount() != 1)) {
-			// Is an item and is not the last item
-			return true;
-		} else if (object instanceof ISimpleCSSubItem) {
-			// Is a subitem
-			return true;
-		}
-		// Cannot cut anything else
-		return false;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSSourcePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSSourcePage.java
deleted file mode 100755
index a35341f..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSSourcePage.java
+++ /dev/null

@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Les Jones <lesojones@gmail.com> - Bug 214511
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.*;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.text.SimpleCSModel;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions.SimpleCSPreviewAction;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.XMLSourcePage;
-
-/**
- * SimpleCSSourcePage
- *
- */
-public class SimpleCSSourcePage extends XMLSourcePage {
-
-	/**
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public SimpleCSSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEProjectionSourcePage#isQuickOutlineEnabled()
-	 */
-	public boolean isQuickOutlineEnabled() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineComparator()
-	 */
-	public ViewerComparator createOutlineComparator() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineContentProvider()
-	 */
-	public ITreeContentProvider createOutlineContentProvider() {
-		return new SimpleCSContentProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineLabelProvider()
-	 */
-	public ILabelProvider createOutlineLabelProvider() {
-		return PDEUserAssistanceUIPlugin.getDefault().getLabelProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#updateSelection(java.lang.Object)
-	 */
-	public void updateSelection(Object object) {
-		if ((object instanceof IDocumentElementNode) && (((IDocumentElementNode) object).isErrorNode() == false)) {
-			setSelectedObject(object);
-			setHighlightRange((IDocumentElementNode) object, true);
-			setSelectedRange((IDocumentElementNode) object, false);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#findRange()
-	 */
-	protected IDocumentRange findRange() {
-
-		Object selectedObject = getSelection();
-
-		if (selectedObject instanceof IDocumentElementNode) {
-			return (IDocumentElementNode) selectedObject;
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#getRangeElement(int, boolean)
-	 */
-	public IDocumentRange getRangeElement(int offset, boolean searchChildren) {
-		IDocumentElementNode rootNode = ((SimpleCSModel) getInputContext().getModel()).getSimpleCS();
-		return findNode(rootNode, offset, searchChildren);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#synchronizeOutlinePage(int)
-	 */
-	protected void synchronizeOutlinePage(int offset) {
-		IDocumentRange range = getRangeElement(offset, true);
-		updateHighlightRange(range);
-		range = adaptRange(range);
-		updateOutlinePageSelection(range);
-	}
-
-	/**
-	 * @param range
-	 */
-	public IDocumentRange adaptRange(IDocumentRange range) {
-		// Adapt the range to node that is viewable in the outline view
-		if (range instanceof IDocumentAttributeNode) {
-			// Attribute
-			return adaptRange(((IDocumentAttributeNode) range).getEnclosingElement());
-		} else if (range instanceof IDocumentTextNode) {
-			// Content
-			return adaptRange(((IDocumentTextNode) range).getEnclosingElement());
-		} else if (range instanceof IDocumentElementNode) {
-			// Element
-			if (range instanceof ISimpleCS) {
-				return range;
-			} else if (range instanceof ISimpleCSItem) {
-				return range;
-			} else if (range instanceof ISimpleCSSubItemObject) {
-				return range;
-			} else if (range instanceof ISimpleCSIntro) {
-				return range;
-			} else if (range instanceof ISimpleCSPerformWhen) {
-				return range;
-			} else {
-				return adaptRange(((IDocumentElementNode) range).getParentNode());
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEProjectionSourcePage#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void editorContextMenuAboutToShow(IMenuManager menu) {
-		// Get the editor
-		PDEFormEditor editor = (PDEFormEditor) getEditor();
-		// Get the form editor contributor
-		SimpleCSEditorContributor contributor = (SimpleCSEditorContributor) editor.getContributor();
-		// Get the model
-		// TODO: MP: SimpleCS:  Preview does not show unsaved changes made to source page, 
-		// check if fixed after implementing text edit operations
-		ISimpleCSModel model = (ISimpleCSModel) editor.getAggregateModel();
-		// Get the preview action
-		SimpleCSPreviewAction previewAction = contributor.getPreviewAction();
-		// Set the cheat sheet object
-		previewAction.setDataModelObject(model.getSimpleCS());
-		// Set the editor input
-		previewAction.setEditorInput(editor.getEditorInput());
-		// Add the preview action to the context menu
-		menu.add(previewAction);
-		menu.add(new Separator());
-		super.editorContextMenuAboutToShow(menu);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#setPartName(java.lang.String)
-	 */
-	protected void setPartName(String partName) {
-		super.setPartName(SimpleMessages.SimpleCSSourcePage_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.editors.text.TextEditor#initializeEditor()
-	 */
-	protected void initializeEditor() {
-		super.initializeEditor();
-		setHelpContextId(IHelpContextIds.SIMPLE_CS_EDITOR);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEProjectionSourcePage#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (IHyperlinkDetector.class.equals(adapter)) {
-			return new SimpleCSHyperlinkDetector(this);
-		}
-		return super.getAdapter(adapter);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleMessages.java
deleted file mode 100644
index 6fc8e2f..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleMessages.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple;
-
-import org.eclipse.osgi.util.NLS;
-
-public class SimpleMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.messages"; //$NON-NLS-1$
-	public static String SimpleCSDefinitionPage_errorMessage;
-	public static String SimpleCSDefinitionPage_loadFailure;
-	public static String SimpleCSDefinitionPage_title;
-	public static String SimpleCSMasterTreeSection_addStep;
-	public static String SimpleCSMasterTreeSection_addSubStep;
-	public static String SimpleCSMasterTreeSection_collapseAll;
-	public static String SimpleCSMasterTreeSection_descriptionText1;
-	public static String SimpleCSMasterTreeSection_descriptionText2;
-	public static String SimpleCSMasterTreeSection_down;
-	public static String SimpleCSMasterTreeSection_new;
-	public static String SimpleCSMasterTreeSection_preview;
-	public static String SimpleCSMasterTreeSection_remove;
-	public static String SimpleCSMasterTreeSection_sectionDescription;
-	public static String SimpleCSMasterTreeSection_sectionTitle;
-	public static String SimpleCSMasterTreeSection_up;
-	public static String SimpleCSSourcePage_title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, SimpleMessages.class);
-	}
-
-	private SimpleMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleActionMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleActionMessages.java
deleted file mode 100644
index aa9ed87..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleActionMessages.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public class SimpleActionMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions.messages"; //$NON-NLS-1$
-	public static String SimpleCSAddStepAction_actionDescription;
-	public static String SimpleCSAddStepAction_actionLabel;
-	public static String SimpleCSAddStepAction_actionText;
-	public static String SimpleCSAddSubStepAction_actionLabel;
-	public static String SimpleCSAddSubStepAction_actionText;
-	public static String SimpleCSPreviewAction_actionText;
-	public static String SimpleCSRemoveRunObjectAction_actionText;
-	public static String SimpleCSRemoveStepAction_actionText;
-	public static String SimpleCSRemoveSubStepAction_actionText;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, SimpleActionMessages.class);
-	}
-
-	private SimpleActionMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddStepAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddStepAction.java
deleted file mode 100755
index faf0339..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddStepAction.java
+++ /dev/null

@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSDescription;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSIntro;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModelFactory;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.BaseCSCreationOperation;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-
-/**
- * SimpleCSAddStepAction
- *
- */
-public class SimpleCSAddStepAction extends Action {
-
-	private ISimpleCS fCheatsheet;
-
-	private ISimpleCSItem fItem;
-
-	private ISimpleCSIntro fIntro;
-
-	/**
-	 * 
-	 */
-	public SimpleCSAddStepAction() {
-		setText(SimpleActionMessages.SimpleCSAddStepAction_actionText);
-	}
-
-	/**
-	 * @param csObject
-	 */
-	public void setDataObject(ISimpleCSObject csObject) {
-		// Determine input
-		if (csObject.getType() == ISimpleCSConstants.TYPE_CHEAT_SHEET) {
-			fIntro = null;
-			fItem = null;
-			fCheatsheet = (ISimpleCS) csObject;
-		} else if (csObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			fIntro = null;
-			fItem = (ISimpleCSItem) csObject;
-			fCheatsheet = fItem.getSimpleCS();
-		} else if (csObject.getType() == ISimpleCSConstants.TYPE_INTRO) {
-			fIntro = (ISimpleCSIntro) csObject;
-			fItem = null;
-			fCheatsheet = fIntro.getSimpleCS();
-		} else {
-			// Invalid input, action will not run
-			fIntro = null;
-			fItem = null;
-			fCheatsheet = null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		// Ensure we have valid input
-		if (fCheatsheet == null) {
-			return;
-		}
-		// Create the new item
-		ISimpleCSItem newItem = createNewItem();
-		// Insert the new item
-		insertNewItem(newItem);
-	}
-
-	/**
-	 * @param item
-	 */
-	private void insertNewItem(ISimpleCSItem newItem) {
-		// Insert the new item depending on the input specfied
-		if (fIntro != null) {
-			// Intro input object
-			// Insert item as the first cheat sheet child item which is the first
-			// node after the introduction node
-			fCheatsheet.addItem(0, newItem);
-		} else if (fItem != null) {
-			// Item input object
-			// Insert item right after the input item object
-			int index = fCheatsheet.indexOfItem(fItem) + 1;
-			fCheatsheet.addItem(index, newItem);
-		} else {
-			// Cheat sheet input object
-			// Add item as the last cheat sheet child item
-			fCheatsheet.addItem(newItem);
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private ISimpleCSItem createNewItem() {
-		ISimpleCSModelFactory factory = fCheatsheet.getModel().getFactory();
-		// Create the new item
-		// Element: item
-		ISimpleCSItem item = factory.createSimpleCSItem(fCheatsheet);
-
-		ISimpleCSItem[] items = fCheatsheet.getItems();
-		String[] itemNames = new String[items.length];
-
-		for (int i = 0; i < items.length; ++i) {
-			itemNames[i] = items[i].getTitle();
-		}
-
-		item.setTitle(PDELabelUtility.generateName(itemNames, SimpleActionMessages.SimpleCSAddStepAction_actionLabel));
-		// Element: description
-		ISimpleCSDescription description = factory.createSimpleCSDescription(item);
-		description.setContent(BaseCSCreationOperation.formatTextBold(SimpleActionMessages.SimpleCSAddStepAction_actionDescription));
-		item.setDescription(description);
-		return item;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddSubStepAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddSubStepAction.java
deleted file mode 100755
index 90be077..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddSubStepAction.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModelFactory;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItemObject;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-
-/**
- * SimpleCSAddStepAction
- *
- */
-public class SimpleCSAddSubStepAction extends Action {
-
-	private ISimpleCSItem fItem;
-
-	private ISimpleCSSubItem fSubitem;
-
-	/**
-	 * 
-	 */
-	public SimpleCSAddSubStepAction() {
-		setText(SimpleActionMessages.SimpleCSAddSubStepAction_actionText);
-	}
-
-	/**
-	 * @param cheatsheet
-	 */
-	public void setDataObject(ISimpleCSObject csObject) {
-		// Determine input
-		if (csObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			fSubitem = null;
-			fItem = (ISimpleCSItem) csObject;
-		} else if (csObject.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-			fSubitem = (ISimpleCSSubItem) csObject;
-			ISimpleCSObject parentObject = fSubitem.getParent();
-			// Determine input's parent object
-			if (parentObject.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				fItem = (ISimpleCSItem) parentObject;
-			} else if (parentObject.getType() == ISimpleCSConstants.TYPE_CONDITIONAL_SUBITEM) {
-				// Not supported by editor, action will not run
-				fItem = null;
-			} else if (parentObject.getType() == ISimpleCSConstants.TYPE_REPEATED_SUBITEM) {
-				// Note supported by editor, action will not run
-				fItem = null;
-			}
-		} else {
-			// Invalid input, action will not run
-			fSubitem = null;
-			fItem = null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		// Ensure we have valid input
-		if (fItem == null) {
-			return;
-		}
-		// Create the new subitem
-		ISimpleCSSubItem newSubItem = createNewSubItem();
-		// Insert the new subitem
-		insertNewSubItem(newSubItem);
-	}
-
-	/**
-	 * @return
-	 */
-	private ISimpleCSSubItem createNewSubItem() {
-		ISimpleCSModelFactory factory = fItem.getModel().getFactory();
-		// Element: subitem
-		ISimpleCSSubItem subitem = factory.createSimpleCSSubItem(fItem);
-
-		ISimpleCSSubItemObject[] subItems = fItem.getSubItems();
-		ArrayList subItemNames = new ArrayList(subItems.length);
-
-		for (int i = 0; i < subItems.length; ++i) {
-			if (subItems[i].getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-				subItemNames.add(((ISimpleCSSubItem) subItems[i]).getLabel());
-			}
-		}
-
-		String[] names = (String[]) subItemNames.toArray(new String[subItemNames.size()]);
-
-		// Set on the proper parent object
-		subitem.setLabel(PDELabelUtility.generateName(names, SimpleActionMessages.SimpleCSAddSubStepAction_actionLabel));
-		return subitem;
-	}
-
-	/**
-	 * @param newSubItem
-	 */
-	private void insertNewSubItem(ISimpleCSSubItem newSubItem) {
-		// Insert the new subitem depending on the input specfied
-		if (fSubitem != null) {
-			// Subitem input object
-			// Insert subitem right after the input item object
-			int index = fItem.indexOfSubItem(fSubitem) + 1;
-			fItem.addSubItem(index, newSubItem);
-		} else {
-			// Item input object
-			// Insert subitem as the last child subitem
-			fItem.addSubItem(newSubItem);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSPreviewAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSPreviewAction.java
deleted file mode 100755
index 1e39263..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSPreviewAction.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.cheatsheets.OpenCheatSheetAction;
-
-/**
- * SimpleCSPreviewAction
- *
- */
-public class SimpleCSPreviewAction extends Action {
-
-	private ISimpleCS fDataModelObject;
-
-	private IEditorInput fEditorInput;
-
-	/**
-	 * @param input
-	 */
-	public SimpleCSPreviewAction() {
-		fDataModelObject = null;
-		fEditorInput = null;
-		// Set action name
-		setText(SimpleActionMessages.SimpleCSPreviewAction_actionText);
-		// Set action image
-		setImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_CHEATSHEET_OBJ);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		// Ensure we have our input
-		if (fDataModelObject == null) {
-			return;
-		} else if (fEditorInput == null) {
-			return;
-		}
-		// Get the editor input
-		// Could be IFileEditorInput (File in workpspace - e.g. Package Explorer View)
-		// Could be IStorageEditorInput (File not in workpsace - e.g. CVS Repositories View)
-		try {
-			// Write the current model into a String as raw XML
-			StringWriter swriter = new StringWriter();
-			PrintWriter writer = new PrintWriter(swriter);
-			fDataModelObject.write("", writer); //$NON-NLS-1$
-			writer.flush();
-			swriter.close();
-			// Launch in the cheat sheet view
-			// Note:  Having a null URL is valid for simple cheat sheets
-			OpenCheatSheetAction openAction = new OpenCheatSheetAction(fEditorInput.getName(), fEditorInput.getName(), swriter.toString(), null);
-			openAction.run();
-		} catch (IOException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setDataModelObject(ISimpleCS object) {
-		fDataModelObject = object;
-	}
-
-	/**
-	 * @param editorInput
-	 */
-	public void setEditorInput(IEditorInput editorInput) {
-		fEditorInput = editorInput;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveRunObjectAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveRunObjectAction.java
deleted file mode 100755
index 78ab9e0..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveRunObjectAction.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSPerformWhen;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunContainerObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-
-/**
- * SimpleCSAddStepAction
- *
- */
-public class SimpleCSRemoveRunObjectAction extends Action {
-
-	private ISimpleCSRunContainerObject fRunContainerObject;
-
-	/**
-	 * 
-	 */
-	public SimpleCSRemoveRunObjectAction() {
-		setText(SimpleActionMessages.SimpleCSRemoveRunObjectAction_actionText);
-//		setImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_GEL_SC_OBJ);
-//		setToolTipText(PDEUIMessages.SchemaEditor_NewElement_tooltip);
-	}
-
-	/**
-	 * @param cheatsheet
-	 */
-	public void setRunObject(ISimpleCSRunContainerObject runObject) {
-		fRunContainerObject = runObject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fRunContainerObject != null) {
-			// Determine parent type and remove accordingly 
-			ISimpleCSObject parent = fRunContainerObject.getParent();
-			if (parent.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				ISimpleCSItem item = (ISimpleCSItem) parent;
-				item.setExecutable(null);
-			} else if (parent.getType() == ISimpleCSConstants.TYPE_SUBITEM) {
-				ISimpleCSSubItem subitem = (ISimpleCSSubItem) parent;
-				subitem.setExecutable(null);
-			} else if (parent.getType() == ISimpleCSConstants.TYPE_PERFORM_WHEN) {
-				// Specifically for perform-when edge case
-				// Action and command supported; but, will never be applicable
-				if ((fRunContainerObject.getType() == ISimpleCSConstants.TYPE_ACTION) || (fRunContainerObject.getType() == ISimpleCSConstants.TYPE_COMMAND)) {
-					ISimpleCSPerformWhen performWhen = (ISimpleCSPerformWhen) parent;
-					performWhen.removeExecutable((ISimpleCSRunObject) fRunContainerObject);
-				}
-			}
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveStepAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveStepAction.java
deleted file mode 100755
index 79e9f17..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveStepAction.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-
-/**
- * SimpleCSAddStepAction
- *
- */
-public class SimpleCSRemoveStepAction extends Action {
-
-	private ISimpleCSItem fItem;
-
-	private ISimpleCSObject fObjectToSelect;
-
-	/**
-	 * 
-	 */
-	public SimpleCSRemoveStepAction() {
-		setText(SimpleActionMessages.SimpleCSRemoveStepAction_actionText);
-		// TODO: MP: LOW: SimpleCS:  Add tool-tip / image ?
-//		setImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_GEL_SC_OBJ);
-//		setToolTipText(PDEUIMessages.SchemaEditor_NewElement_tooltip);
-		fItem = null;
-		fObjectToSelect = null;
-	}
-
-	/**
-	 * @param cheatsheet
-	 */
-	public void setItem(ISimpleCSItem item) {
-		fItem = item;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fItem != null) {
-			// Parent can only be a cheat sheet
-			ISimpleCS cheatsheet = (ISimpleCS) fItem.getParent();
-			// Determine the item to select after the deletion takes place 
-			determineItemToSelect(cheatsheet);
-			// Remove the item
-			cheatsheet.removeItem(fItem);
-		}
-	}
-
-	/**
-	 * @param cheatsheet
-	 */
-	private void determineItemToSelect(ISimpleCS cheatsheet) {
-		// Select the next sibling
-		fObjectToSelect = cheatsheet.getNextSibling(fItem);
-		if (fObjectToSelect == null) {
-			// No next sibling
-			// Select the previous sibling
-			fObjectToSelect = cheatsheet.getPreviousSibling(fItem);
-			if (fObjectToSelect == null) {
-				// No previous sibling
-				// Select the parent
-				fObjectToSelect = cheatsheet;
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSObject getObjectToSelect() {
-		return fObjectToSelect;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveSubStepAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveSubStepAction.java
deleted file mode 100755
index 2a18e6d..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveSubStepAction.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConditionalSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSObject;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRepeatedSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItemObject;
-
-/**
- * SimpleCSAddStepAction
- *
- */
-public class SimpleCSRemoveSubStepAction extends Action {
-
-	private ISimpleCSSubItemObject fSubItem;
-
-	private ISimpleCSObject fObjectToSelect;
-
-	/**
-	 * 
-	 */
-	public SimpleCSRemoveSubStepAction() {
-		// TODO: MP: LOW: SimpleCS:  Add tool-tip / image ?
-		setText(SimpleActionMessages.SimpleCSRemoveSubStepAction_actionText);
-//		setImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_GEL_SC_OBJ);
-//		setToolTipText(PDEUIMessages.SchemaEditor_NewElement_tooltip);
-		fSubItem = null;
-		fObjectToSelect = null;
-	}
-
-	/**
-	 * @param subitem
-	 */
-	public void setSubItem(ISimpleCSSubItemObject subitem) {
-		fSubItem = subitem;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fSubItem != null) {
-			// Determine parent type and remove accordingly 
-			ISimpleCSObject parent = fSubItem.getParent();
-			if (parent.getType() == ISimpleCSConstants.TYPE_ITEM) {
-				// Parent is an item
-				ISimpleCSItem item = (ISimpleCSItem) parent;
-				// Determine the item to select after the deletion takes place 
-				determineItemToSelect(item);
-				// Remove the subitem
-				item.removeSubItem(fSubItem);
-			} else if ((parent.getType() == ISimpleCSConstants.TYPE_REPEATED_SUBITEM) && (fSubItem.getType() == ISimpleCSConstants.TYPE_SUBITEM)) {
-				// Parent is a repeated subitem
-				ISimpleCSRepeatedSubItem subitem = (ISimpleCSRepeatedSubItem) parent;
-				// Determine the item to select after the deletion takes place 
-				determineItemToSelect(subitem);
-				// Remove the subitem
-				subitem.setSubItem(null);
-			} else if ((parent.getType() == ISimpleCSConstants.TYPE_CONDITIONAL_SUBITEM) && (fSubItem.getType() == ISimpleCSConstants.TYPE_SUBITEM)) {
-				// Parent is a conditional subitem
-				ISimpleCSConditionalSubItem subitem = (ISimpleCSConditionalSubItem) parent;
-				// Determine the item to select after the deletion takes place 
-				determineItemToSelect(subitem);
-				// Remove the subitem
-				subitem.removeSubItem((ISimpleCSSubItem) fSubItem);
-			}
-		}
-	}
-
-	/**
-	 * @param item
-	 */
-	private void determineItemToSelect(ISimpleCSItem item) {
-		// Select the next sibling
-		fObjectToSelect = item.getNextSibling(fSubItem);
-		if (fObjectToSelect == null) {
-			// No next sibling
-			// Select the previous sibling
-			fObjectToSelect = item.getPreviousSibling(fSubItem);
-			if (fObjectToSelect == null) {
-				// No previous sibling
-				// Select the parent
-				fObjectToSelect = item;
-			}
-		}
-	}
-
-	/**
-	 * @param item
-	 */
-	private void determineItemToSelect(ISimpleCSObject object) {
-		// The parent itself
-		fObjectToSelect = object;
-	}
-
-	/**
-	 * @return
-	 */
-	public ISimpleCSObject getObjectToSelect() {
-		return fObjectToSelect;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/messages.properties
deleted file mode 100644
index f899a71..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/messages.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-SimpleCSAddStepAction_actionDescription=Body
-SimpleCSAddStepAction_actionLabel=Item
-SimpleCSAddStepAction_actionText=&Step
-SimpleCSAddSubStepAction_actionLabel=Sub-Step
-SimpleCSAddSubStepAction_actionText=&Sub-Step
-SimpleCSPreviewAction_actionText=Preview
-SimpleCSRemoveRunObjectAction_actionText=&Delete
-SimpleCSRemoveStepAction_actionText=&Delete
-SimpleCSRemoveSubStepAction_actionText=&Delete

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandComboPart.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandComboPart.java
deleted file mode 100755
index 506c727..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandComboPart.java
+++ /dev/null

@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import java.util.Iterator;
-
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.ISimpleCSCommandKeyListener;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.NewCommandKeyEvent;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSCommandManager;
-import org.eclipse.pde.internal.ui.parts.ComboPart;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * SimpleCSCommandComboPart
- *
- */
-public class SimpleCSCommandComboPart extends ComboPart implements ISimpleCSCommandKeyListener, DisposeListener {
-
-	private int fNewCommandKeyIndex;
-
-	private int fComboEntryLimit;
-
-	/**
-	 * 
-	 */
-	public SimpleCSCommandComboPart() {
-		super();
-		fNewCommandKeyIndex = -1;
-		fComboEntryLimit = -1;
-	}
-
-	/**
-	 * @param listener
-	 */
-	public void addDisposeListener(DisposeListener listener) {
-		if (combo == null) {
-			return;
-		} else if (combo instanceof Combo) {
-			((Combo) combo).addDisposeListener(listener);
-		} else {
-			((CCombo) combo).addDisposeListener(listener);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.parts.ComboPart#createControl(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit, int)
-	 */
-	public void createControl(Composite parent, FormToolkit toolkit, int style) {
-		super.createControl(parent, toolkit, style);
-		// Connect to the global command manager
-		SimpleCSCommandManager.Instance().addCommandKeyListener(this);
-		// Register to be notified when the combo is diposed in order to 
-		// disconnect from the global command manager
-		addDisposeListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.ISimpleCSCommandKeyListener#newCommandKey(org.eclipse.pde.internal.ui.editor.cheatsheet.simple.NewCommandKeyEvent)
-	 */
-	public void newCommandKey(NewCommandKeyEvent event) {
-		// Source:  Another combo box
-		String key = event.getKey();
-		// Add the new key to the combo if it does not already exist
-		putValueInCombo(key, fNewCommandKeyIndex);
-	}
-
-	/**
-	 * @param key
-	 */
-	private void putValueInCombo(String key, int index) {
-		// Ensure the key does not already exist in the combo
-		if (indexOf(key) != -1) {
-			return;
-		}
-		// If we are at the combo entry limit, remove the least recent entry
-		// that is not selected
-		if (getItemCount() >= fComboEntryLimit) {
-			removeLeastRecentEntry();
-		}
-		// Add the new key
-		if (index < 0) {
-			// Add at the end
-			add(key);
-		} else {
-			// Add at the specified index
-			add(key, index);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void removeLeastRecentEntry() {
-		// The least recent entry is the last non-selected entry in the 
-		// reciever's list
-		int entryCount = getItemCount();
-		// Nothing to do if there is one entry or no entries
-		if (entryCount <= 1) {
-			return;
-		}
-		// There has to be at least two entries
-		int lastEntry = entryCount - 1;
-		// Remove the last entry if it is NOT selected
-		// Important:  The entry may be selected for another model object;
-		// since, the details page is static.  As a result, removing the last
-		// entry for this model object may remove a selected entry for another
-		// model object.  In that case, the entry is re-inserted into the 
-		// reciever when the other model object is selected again 
-		if (lastEntry != getSelectionIndex()) {
-			remove(lastEntry);
-			return;
-		}
-		// Last entry was selected, try the second last entry
-		int secondlastEntry = lastEntry - 1;
-		remove(secondlastEntry);
-	}
-
-	/**
-	 * @param limit
-	 */
-	public void setComboEntryLimit(int limit) {
-		fComboEntryLimit = limit;
-	}
-
-	/**
-	 * @return
-	 */
-	public int getComboEntryLimit() {
-		return fComboEntryLimit;
-	}
-
-	/**
-	 * Specify the index to insert the new command key into the combo box 
-	 * reciever.  Applicable to new command keys obtained via new command key
-	 * events (Source: other combo boxes).
-	 * @param newCommandKeyIndex
-	 */
-	public void setNewCommandKeyIndex(int newCommandKeyIndex) {
-		fNewCommandKeyIndex = newCommandKeyIndex;
-	}
-
-	/**
-	 * @return
-	 */
-	public int getNewCommandKeyIndex() {
-		return fNewCommandKeyIndex;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-	 */
-	public void widgetDisposed(DisposeEvent e) {
-		// Disconnect from the global command manager
-		SimpleCSCommandManager.Instance().removeCommandKeyListener(this);
-	}
-
-	/**
-	 * 
-	 */
-	public void populate() {
-		// Populate the combo with all the values found in the command manager
-		Iterator iterator = SimpleCSCommandManager.Instance().getKeys().iterator();
-		while (iterator.hasNext()) {
-			String key = (String) iterator.next();
-			add(key);
-		}
-	}
-
-	/**
-	 * @param key
-	 * @param value
-	 */
-	public void putValue(String key, String value) {
-		putValue(key, value, -1);
-	}
-
-	/**
-	 * @param key
-	 * @param value
-	 */
-	public void putValue(String key, String value, int index) {
-		// Source:  This combo box
-		// Add the new key to the combo if it does not already exist
-		SimpleCSCommandManager manager = SimpleCSCommandManager.Instance();
-		putValueInCombo(key, index);
-		// Store the actual value in the command manager and notify the
-		// other command combo boxes
-		manager.put(key, value);
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	public String getValue(String key) {
-		return SimpleCSCommandManager.Instance().get(key);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java
deleted file mode 100755
index dd57f5e..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java
+++ /dev/null

@@ -1,560 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.commands.ParameterizedCommand;
-import org.eclipse.core.commands.SerializationException;
-import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.core.expressions.IEvaluationContext;
-import org.eclipse.jface.fieldassist.ControlDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSCommand;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRun;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSRunContainerObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractSubDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSInputContext;
-import org.eclipse.pde.internal.ui.commands.CommandComposerDialog;
-import org.eclipse.pde.internal.ui.commands.CommandComposerPart;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.swt.SWT;
-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.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.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.forms.IFormColors;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.handlers.IHandlerService;
-
-public class SimpleCSCommandDetails extends CSAbstractSubDetails {
-
-	private ISimpleCSRun fRun;
-
-	private Table fCommandTable;
-
-	private SimpleCSCommandComboPart fCommandCombo;
-
-	private ControlDecoration fCommandInfoDecoration;
-
-	private Button fCommandBrowse;
-
-	private Button fCommandOptional;
-
-	private static final String F_NO_COMMAND = SimpleDetailsMessages.SimpleCSCommandDetails_none;
-
-	private static final int F_COMMAND_INSERTION_INDEX = 1;
-
-	/**
-	 * @param section
-	 */
-	public SimpleCSCommandDetails(ICSMaster section) {
-		super(section, SimpleCSInputContext.CONTEXT_ID);
-		fRun = null;
-
-		fCommandTable = null;
-		fCommandCombo = null;
-		fCommandInfoDecoration = null;
-		fCommandBrowse = null;
-		fCommandOptional = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#setData(java.lang.Object)
-	 */
-	public void setData(ISimpleCSRun object) {
-		// Set data
-		fRun = object;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.details.ISimpleCSDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		int columnSpan = 3;
-		Section commandSection = null;
-		FormToolkit toolkit = getToolkit();
-		Color foreground = toolkit.getColors().getColor(IFormColors.TITLE);
-		GridData data = null;
-		Label label = null;
-
-		// Create command section
-		commandSection = toolkit.createSection(parent, Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
-		commandSection.clientVerticalSpacing = FormLayoutFactory.SECTION_HEADER_VERTICAL_SPACING;
-		commandSection.setText(SimpleDetailsMessages.SimpleCSCommandDetails_commandSectionText);
-		commandSection.setDescription(SimpleDetailsMessages.SimpleCSCommandDetails_commandSectionDesc);
-		commandSection.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		commandSection.setLayoutData(data);
-
-		// Create container for command section		
-		Composite commandSectionClient = toolkit.createComposite(commandSection);
-		commandSectionClient.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, columnSpan));
-
-		// Element:  command
-		// Label
-		label = toolkit.createLabel(commandSectionClient, SimpleDetailsMessages.SimpleCSCommandDetails_attrCommand, SWT.WRAP);
-		label.setForeground(foreground);
-		// Combo box
-		fCommandCombo = new SimpleCSCommandComboPart();
-		fCommandCombo.createControl(commandSectionClient, toolkit, SWT.READ_ONLY);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalIndent = FormLayoutFactory.CONTROL_HORIZONTAL_INDENT;
-		fCommandCombo.getControl().setLayoutData(data);
-		// Insertion index is 0 for no command combo box entry
-		// Always keep this entry as the first entry
-		fCommandCombo.add(F_NO_COMMAND);
-		fCommandCombo.setText(F_NO_COMMAND);
-		fCommandCombo.populate();
-		// Always insert new command keys obtained from other combo boxes in 
-		// the position after the no command entry
-		fCommandCombo.setNewCommandKeyIndex(F_COMMAND_INSERTION_INDEX);
-		// Limit the combo box to the 11 most recent entries (includes no 
-		// command entry)
-		fCommandCombo.setComboEntryLimit(11);
-
-		createCommandInfoDecoration();
-		// Button
-		fCommandBrowse = toolkit.createButton(commandSectionClient, SimpleDetailsMessages.SimpleCSCommandDetails_browse, SWT.PUSH);
-
-		// Element: command
-		// Label for parameters
-		label = toolkit.createLabel(commandSectionClient, SimpleDetailsMessages.SimpleCSCommandDetails_attrParameters, SWT.WRAP);
-		label.setForeground(foreground);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = columnSpan;
-		label.setLayoutData(data);
-
-		fCommandTable = toolkit.createTable(commandSectionClient, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.heightHint = 25;
-		data.horizontalSpan = columnSpan;
-		fCommandTable.setLayoutData(data);
-		//fCommandTable.setHeaderVisible(true);
-		fCommandTable.setLinesVisible(true);
-		//fCommandTable.setForeground(foreground);
-		TableColumn tableColumn1 = new TableColumn(fCommandTable, SWT.LEFT);
-		tableColumn1.setText(SimpleDetailsMessages.SimpleCSCommandDetails_name);
-		TableColumn tableColumn2 = new TableColumn(fCommandTable, SWT.LEFT);
-		tableColumn2.setText(SimpleDetailsMessages.SimpleCSCommandDetails_value);
-
-		// Attribute: required
-		fCommandOptional = getToolkit().createButton(commandSectionClient, SimpleDetailsMessages.SimpleCSCommandDetails_attrOptional, SWT.CHECK);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = columnSpan;
-		fCommandOptional.setLayoutData(data);
-		fCommandOptional.setForeground(foreground);
-
-		// Bind widgets
-		toolkit.paintBordersFor(commandSectionClient);
-		commandSection.setClient(commandSectionClient);
-		// Mark as a details part to enable cut, copy, paste, etc.
-		markDetailsPart(commandSection);
-	}
-
-	/**
-	 * @param label
-	 */
-	private void createCommandInfoDecoration() {
-		// Command info decoration
-		int bits = SWT.TOP | SWT.LEFT;
-		fCommandInfoDecoration = new ControlDecoration(fCommandCombo.getControl(), bits);
-		fCommandInfoDecoration.setMarginWidth(1);
-		fCommandInfoDecoration.setDescriptionText(SimpleDetailsMessages.SimpleCSCommandDetails_disabled);
-		updateCommandInfoDecoration(false);
-		fCommandInfoDecoration.setImage(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_INFORMATION).getImage());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.details.ISimpleCSDetails#hookListeners()
-	 */
-	public void hookListeners() {
-
-		// Element: command
-		fCommandCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fRun == null) {
-					return;
-				}
-				String selection = fCommandCombo.getSelection();
-				if (selection.equals(F_NO_COMMAND) == false) {
-					// Get the associated serialization stored as data against the 
-					// command name
-					String serialization = fCommandCombo.getValue(selection);
-					if (PDETextHelper.isDefined(serialization)) {
-						// Create the new command in the model
-						createCommandInModel(serialization);
-
-						ParameterizedCommand result = getParameterizedCommand(serialization);
-						if (result != null) {
-							updateCommandTable(result.getParameterMap());
-						}
-					}
-				} else {
-					// The empty entry was selected
-					// Delete the existing command
-					fRun.setExecutable(null);
-					fCommandTable.clearAll();
-				}
-				// Update the master section buttons
-				getMasterSection().updateButtons();
-				// Update the optional command checkbox
-				updateUICommandOptional();
-			}
-		});
-
-		fCommandBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fRun == null) {
-					return;
-				}
-				// Open the command composer dialog using the input from the
-				// currently selected command
-				CommandComposerDialog dialog = new CommandComposerDialog(fCommandBrowse.getShell(), CommandComposerPart.F_CHEATSHEET_FILTER, getParameterizedCommand(fRun), getSnapshotContext());
-				// Check result of dialog
-				if (dialog.open() == Window.OK) {
-					// Command composer exited successfully
-					// Update accordingly
-					updateCommandCombo(dialog.getCommand(), true);
-					// Update the master section buttons
-					getMasterSection().updateButtons();
-					// Update the optional command checkbox
-					updateUICommandOptional();
-				}
-			}
-		});
-
-		// Attribute: required
-		fCommandOptional.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fRun == null) {
-					return;
-				}
-				// Get the command
-				ISimpleCSCommand commandObject = getCommandObject(fRun);
-				// Ensure the command is defined
-				if (commandObject == null) {
-					return;
-				}
-				// Set required value in model
-				boolean isRequired = (fCommandOptional.getSelection() == false);
-				commandObject.setRequired(isRequired);
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.details.ISimpleCSDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fRun == null) {
-			return;
-		}
-		// i.e. Action: class
-		ParameterizedCommand command = getParameterizedCommand(fRun);
-		if (command == null) {
-			// Since, this page is static the command combo and command table
-			// must be reset
-			clearCommandUI();
-		} else {
-			updateCommandCombo(command, false);
-		}
-		// Update the optional command checkbox
-		updateUICommandOptional();
-		// Update command UI enablement
-		updateCommandEnablement();
-	}
-
-	/**
-	 * 
-	 */
-	private void updateUICommandOptional() {
-		// Attribute: required
-		ISimpleCSCommand commandObject = getCommandObject(fRun);
-		if (commandObject == null) {
-			fCommandOptional.setSelection(false);
-			fCommandOptional.setEnabled(false);
-		} else {
-			boolean isOptional = (commandObject.getRequired() == false);
-			fCommandOptional.setSelection(isOptional);
-			fCommandOptional.setEnabled(isEditableElement());
-		}
-	}
-
-	/**
-	 * @param runObject
-	 * @return
-	 */
-	private ISimpleCSCommand getCommandObject(ISimpleCSRun runObject) {
-		// Ensure the run object is defined
-		if (runObject == null) {
-			return null;
-		}
-		// Get the executable
-		ISimpleCSRunContainerObject executable = runObject.getExecutable();
-		// Ensure executable is defined
-		if (executable == null) {
-			return null;
-		} else if (executable.getType() != ISimpleCSConstants.TYPE_COMMAND) {
-			// Not a command
-			return null;
-		}
-		return (ISimpleCSCommand) executable;
-	}
-
-	/**
-	 * 
-	 */
-	private void clearCommandUI() {
-		// Clear the command combo
-		fCommandCombo.setText(F_NO_COMMAND);
-		// Clear the command table
-		fCommandTable.clearAll();
-	}
-
-	/**
-	 * 
-	 */
-	private void updateCommandEnablement() {
-		// Ensure data object is defined
-		if (fRun == null) {
-			return;
-		}
-		boolean editable = isEditableElement();
-
-		if (fRun.getType() == ISimpleCSConstants.TYPE_ITEM) {
-			ISimpleCSItem item = (ISimpleCSItem) fRun;
-			// Preserve cheat sheet validity
-			// Semantic Rule:  Cannot have a subitem and any of the following
-			// together:  perform-when, command, action			
-			if (item.hasSubItems()) {
-				editable = false;
-				updateCommandInfoDecoration(true);
-			} else {
-				updateCommandInfoDecoration(false);
-			}
-		}
-
-		fCommandCombo.setEnabled(editable);
-		fCommandTable.setEnabled(true);
-		fCommandBrowse.setEnabled(editable);
-	}
-
-	/**
-	 * @param serialization
-	 */
-	private void createCommandInModel(String serialization) {
-		// Ensure data object is defined
-		if (fRun == null) {
-			return;
-		}
-		ISimpleCSCommand command = fRun.getModel().getFactory().createSimpleCSCommand(fRun);
-		command.setSerialization(serialization);
-		command.setRequired(false);
-		fRun.setExecutable(command);
-	}
-
-	/**
-	 * @param result
-	 * @param createInModel
-	 */
-	private void updateCommandCombo(ParameterizedCommand result, boolean createInModel) {
-
-		if (result == null) {
-			return;
-		}
-		// Get serialization
-		String serialization = result.serialize();
-		// Get presentable command name
-		String commandName = null;
-		try {
-			commandName = result.getCommand().getName();
-		} catch (NotDefinedException e) {
-			// Ignore, name will be undefined
-		}
-		// Get command ID
-		String commandId = result.getId();
-
-		if (PDETextHelper.isDefined(serialization) && PDETextHelper.isDefined(commandId)) {
-			if (createInModel) {
-				// Create the new command in the model
-				createCommandInModel(serialization);
-			}
-			// Determine the presentable name to use in the combo box and the
-			// key to store the serialization data against in the widget
-			String nameToUse = null;
-			if (PDETextHelper.isDefined(commandName)) {
-				nameToUse = commandName;
-			} else {
-				nameToUse = commandId;
-			}
-			// Add new selection to the combo box if it is not already there
-			// Associate the serialization with the command name
-			// in the widget to retrieve for later use
-			fCommandCombo.putValue(nameToUse, serialization, F_COMMAND_INSERTION_INDEX);
-			// Select it
-			fCommandCombo.setText(nameToUse);
-			// Update the command table parameters
-			updateCommandTable(result.getParameterMap());
-		} else {
-			// No serialization, something bad happened
-			fCommandCombo.setText(F_NO_COMMAND);
-		}
-
-	}
-
-	/**
-	 * @param serialization
-	 * @return
-	 */
-	private ParameterizedCommand getParameterizedCommand(String serialization) {
-		if (PDETextHelper.isDefined(serialization)) {
-			ICommandService service = getCommandService();
-			if (service != null) {
-				try {
-					return service.deserialize(serialization);
-				} catch (NotDefinedException e) {
-					PDEUserAssistanceUIPlugin.logException(e, SimpleDetailsMessages.SimpleCSCommandDetails_errTitle, SimpleDetailsMessages.SimpleCSCommandDetails_errMsg + serialization);
-				} catch (SerializationException e) {
-					PDEUserAssistanceUIPlugin.logException(e, SimpleDetailsMessages.SimpleCSCommandDetails_errTitle, SimpleDetailsMessages.SimpleCSCommandDetails_errMsg + serialization);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param run
-	 * @return
-	 */
-	private ParameterizedCommand getParameterizedCommand(ISimpleCSRun run) {
-		if (run == null) {
-			return null;
-		}
-		ISimpleCSRunContainerObject object = run.getExecutable();
-		if ((object != null) && (object.getType() == ISimpleCSConstants.TYPE_COMMAND)) {
-			ISimpleCSCommand command = (ISimpleCSCommand) object;
-			return getParameterizedCommand(command.getSerialization());
-		}
-		return null;
-	}
-
-	/**
-	 * @param parameters
-	 */
-	private void updateCommandTable(Map parameters) {
-		// Clear the table contents
-		fCommandTable.clearAll();
-
-		if ((parameters != null) && (parameters.isEmpty() == false)) {
-			// Iterate over the keys in the map
-			Iterator it = parameters.keySet().iterator();
-			int rowCount = 0;
-			while (it.hasNext()) {
-				// Track number of keys / rows processed
-				TableItem item = null;
-				// Determine if there is an existing row already at that index
-				if (rowCount < fCommandTable.getItemCount()) {
-					// There is, reuse it
-					item = fCommandTable.getItem(rowCount);
-				} else {
-					// There isn't, create a new one
-					item = new TableItem(fCommandTable, SWT.NONE);
-				}
-				// Get key
-				Object key = it.next();
-				if (key instanceof String) {
-					String keyString = (String) key;
-					// If present, remove the fully qualified ID from the
-					// paramater key
-					// i.e. "org.eclipse.ui.perspective" becomes just 
-					// "perspective" 
-					int dotIndex = keyString.lastIndexOf('.');
-					if ((dotIndex != -1) && (dotIndex != (keyString.length() - 1))) {
-						keyString = keyString.substring(dotIndex + 1);
-					}
-					// Set parameter key in first column
-					item.setText(0, keyString);
-				}
-				Object value = parameters.get(key);
-				if (value instanceof String) {
-					// Set parameter value in second column
-					item.setText(1, (String) value);
-				}
-				rowCount++;
-			}
-			// Pack the columns with the new data
-			for (int i = 0; i < fCommandTable.getColumnCount(); i++) {
-				TableColumn tableColumn = fCommandTable.getColumn(i);
-				tableColumn.pack();
-			}
-		}
-	}
-
-	private static ICommandService getCommandService() {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		return (ICommandService) workbench.getAdapter(ICommandService.class);
-	}
-
-	private static IHandlerService getGlobalHandlerService() {
-		return (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
-	}
-
-	private static IEvaluationContext getSnapshotContext() {
-		IHandlerService service = getGlobalHandlerService();
-		return service.createContextSnapshot(false);
-	}
-
-	/**
-	 * 
-	 */
-	private void updateCommandInfoDecoration(boolean showDecoration) {
-		if (showDecoration) {
-			fCommandInfoDecoration.show();
-		} else {
-			fCommandInfoDecoration.hide();
-		}
-		fCommandInfoDecoration.setShowHover(showDecoration);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// NO-OP
-		// No form entries
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSDetails.java
deleted file mode 100755
index df4383f..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSDetails.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCS;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSInputContext;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * SimpleCSDetails
- *
- */
-public class SimpleCSDetails extends CSAbstractDetails {
-
-	private ISimpleCS fCheatSheet;
-
-	private FormEntry fTitle;
-
-	private Section fMainSection;
-
-	/**
-	 * @param section
-	 */
-	public SimpleCSDetails(ICSMaster section) {
-		super(section, SimpleCSInputContext.CONTEXT_ID);
-		fCheatSheet = null;
-
-		fTitle = null;
-		fMainSection = null;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ISimpleCS object) {
-		// Set data
-		fCheatSheet = object;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if ((object == null) || (object instanceof ISimpleCS) == false) {
-			return;
-		}
-		// Set data
-		setData((ISimpleCS) object);
-		// Update the UI given the new data
-		updateFields();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		FormToolkit toolkit = getManagedForm().getToolkit();
-		GridData data = null;
-
-		// Create main section
-		fMainSection = toolkit.createSection(parent, Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
-		fMainSection.clientVerticalSpacing = FormLayoutFactory.SECTION_HEADER_VERTICAL_SPACING;
-		fMainSection.setText(SimpleDetailsMessages.SimpleCSDetails_mainSetionTitle);
-		fMainSection.setDescription(SimpleDetailsMessages.SimpleCSDetails_mainSectionDesc);
-		fMainSection.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		fMainSection.setLayoutData(data);
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fMainSection);
-
-		// Create container for main section
-		Composite mainSectionClient = toolkit.createComposite(fMainSection);
-		mainSectionClient.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
-
-		// Attribute: title
-		fTitle = new FormEntry(mainSectionClient, toolkit, SimpleDetailsMessages.SimpleCSDetails_attrTitle, SWT.NONE);
-
-		// Bind widgets
-		toolkit.paintBordersFor(mainSectionClient);
-		fMainSection.setClient(mainSectionClient);
-		markDetailsPart(fMainSection);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// Attribute: title
-		fTitle.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fCheatSheet == null) {
-					return;
-				}
-				fCheatSheet.setTitle(fTitle.getValue());
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fCheatSheet == null) {
-			return;
-		}
-
-		boolean editable = isEditableElement();
-		// Attribute: title
-		fTitle.setValue(fCheatSheet.getTitle(), true);
-		fTitle.setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fTitle.commit();
-		// No need to call for sub details, because they contain no form entries
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSHelpDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSHelpDetails.java
deleted file mode 100755
index 7dc173b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSHelpDetails.java
+++ /dev/null

@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSHelpObject;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractSubDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSInputContext;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.parts.ComboPart;
-import org.eclipse.pde.internal.ui.util.FileExtensionsFilter;
-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.Color;
-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.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.forms.IFormColors;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * SimpleCSHelpDetailsSection
- * 
- */
-public class SimpleCSHelpDetails extends CSAbstractSubDetails {
-
-	private Text fHelpText;
-
-	private ComboPart fHelpCombo;
-
-	private Label fHelpLabel;
-
-	private Button fHelpBrowse;
-
-	private ISimpleCSHelpObject fHelpObject;
-
-	private Section fHelpSection;
-
-	private boolean fBlockListeners;
-
-	private static final String F_NO_HELP = SimpleDetailsMessages.SimpleCSHelpDetails_none;
-
-	private static final String F_HELP_CONTEXT_ID = SimpleDetailsMessages.SimpleCSHelpDetails_helpContextID;
-
-	private static final String F_HELP_DOCUMENT_LINK = SimpleDetailsMessages.SimpleCSHelpDetails_helpDocumentLink;
-
-	/**
-	 * @param section
-	 */
-	public SimpleCSHelpDetails(ICSMaster section) {
-		super(section, SimpleCSInputContext.CONTEXT_ID);
-		fHelpObject = null;
-		fBlockListeners = false;
-
-		fHelpText = null;
-		fHelpCombo = null;
-		fHelpLabel = null;
-		fHelpBrowse = null;
-
-		fHelpSection = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#setData
-	 * (java.lang.Object)
-	 */
-	public void setData(ISimpleCSHelpObject object) {
-		// Set data
-		fHelpObject = object;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.cheatsheet.simple.details.ISimpleCSDetails
-	 * #createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		int columnSpan = 3;
-		FormToolkit toolkit = getToolkit();
-
-		GridData data = null;
-		Label label = null;
-		Color foreground = toolkit.getColors().getColor(IFormColors.TITLE);
-
-		// Create help section
-		fHelpSection = toolkit.createSection(parent, Section.DESCRIPTION
-				| ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
-		fHelpSection.clientVerticalSpacing = FormLayoutFactory.SECTION_HEADER_VERTICAL_SPACING;
-		fHelpSection
-				.setText(SimpleDetailsMessages.SimpleCSHelpDetails_helpSectionText);
-		fHelpSection
-				.setDescription(SimpleDetailsMessages.SimpleCSHelpDetails_helpSectionDesc);
-		fHelpSection.setLayout(FormLayoutFactory
-				.createClearGridLayout(false, 1));
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		fHelpSection.setLayoutData(data);
-
-		// Create container for help section
-		Composite helpSectionClient = toolkit.createComposite(fHelpSection);
-		helpSectionClient.setLayout(FormLayoutFactory
-				.createSectionClientGridLayout(false, columnSpan));
-
-		// Attribute: href
-		// Attribute: contextId
-		label = toolkit.createLabel(helpSectionClient,
-				SimpleDetailsMessages.SimpleCSHelpDetails_attrType, SWT.WRAP);
-		label.setForeground(foreground);
-
-		// Attribute: href
-		// Attribute: contextId
-		fHelpCombo = new ComboPart();
-		fHelpCombo.createControl(helpSectionClient, toolkit, SWT.READ_ONLY);
-		GridData comboData = new GridData(GridData.FILL_HORIZONTAL);
-		comboData.horizontalSpan = columnSpan - 1;
-		fHelpCombo.getControl().setLayoutData(comboData);
-		fHelpCombo.add(F_NO_HELP);
-		fHelpCombo.add(F_HELP_CONTEXT_ID);
-		fHelpCombo.add(F_HELP_DOCUMENT_LINK);
-		fHelpCombo.setText(F_NO_HELP);
-
-		// Attribute: href
-		// Attribute: contextId
-		fHelpLabel = toolkit.createLabel(helpSectionClient,
-				SimpleDetailsMessages.SimpleCSHelpDetails_attrValue, SWT.WRAP);
-		fHelpLabel.setForeground(foreground);
-
-		// Attribute: href
-		// Attribute: contextId
-		fHelpText = toolkit.createText(helpSectionClient, null);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		fHelpText.setLayoutData(data);
-		// Browse Button
-		fHelpBrowse = toolkit.createButton(helpSectionClient,
-				SimpleDetailsMessages.SimpleCSHelpDetails_browse, SWT.PUSH);
-
-		// Bind widgets
-		toolkit.paintBordersFor(helpSectionClient);
-		fHelpSection.setClient(helpSectionClient);
-		// Mark as a details part to enable cut, copy, paste, etc.
-		markDetailsPart(fHelpSection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.cheatsheet.simple.details.ISimpleCSDetails
-	 * #hookListeners()
-	 */
-	public void hookListeners() {
-
-		// Attribute: href
-		// Attribute: contextId
-		fHelpCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fHelpObject == null) {
-					return;
-				}
-				String selection = fHelpCombo.getSelection();
-				if (selection.equals(F_NO_HELP) == false) {
-					// Help was selected
-					if (selection.equals(F_HELP_CONTEXT_ID)) {
-						// Help context ID was selected, clear the help
-						// document link value
-						fHelpObject.setHref(null);
-						fHelpBrowse.setEnabled(false);
-					} else {
-						// Help document link was selected, clear the help
-						// context ID value
-						fHelpObject.setContextId(null);
-						fHelpBrowse.setEnabled(true);
-					}
-					// Make the label and text field visible
-					fHelpLabel.setVisible(true);
-					fHelpText.setVisible(true);
-					fHelpBrowse.setVisible(true);
-					// Set the focus on the text field
-					fHelpText.setFocus();
-					// Clear the previous contents of the text field
-					// (Will cause field to become dirty)
-					fHelpText.setText(""); //$NON-NLS-1$
-					fHelpText.setToolTipText(""); //$NON-NLS-1$
-				} else {
-					// No help was selected
-					// Make the label and text field invisible
-					fHelpLabel.setVisible(false);
-					fHelpText.setVisible(false);
-					fHelpBrowse.setVisible(false);
-					// Clear values for help in model
-					fHelpObject.setContextId(null);
-					fHelpObject.setHref(null);
-				}
-			}
-		});
-		// Attribute: href
-		// Attribute: contextId
-		fHelpText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				// Block UI updates
-				if (fBlockListeners) {
-					return;
-				}
-				// Ensure data object is defined
-				if (fHelpObject == null) {
-					return;
-				}
-				String selection = fHelpCombo.getSelection();
-				if (selection.equals(F_HELP_CONTEXT_ID)) {
-					// Help context ID was selected, save the field contents
-					// as such
-					fHelpObject.setContextId(fHelpText.getText());
-				} else {
-					// Help document link was selected, save the field contents
-					// as such
-					fHelpObject.setHref(fHelpText.getText());
-				}
-				// Update tooltip
-				fHelpText.setToolTipText(fHelpText.getText());
-			}
-		});
-
-		fHelpBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleButtonSelectedEventBrowse(e);
-			}
-		});
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleButtonSelectedEventBrowse(SelectionEvent event) {
-		// Create the dialog
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
-				getManagedForm().getForm().getShell(),
-				new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		// Disable multiple selection
-		dialog.setAllowMultiple(false);
-		// Title
-		dialog.setTitle(SimpleDetailsMessages.SimpleCSHelpDetails_dialogTitle);
-		// Message
-		dialog.setMessage(SimpleDetailsMessages.SimpleCSHelpDetails_dialogMessage);
-		// Add valid file extensions to filter by
-		FileExtensionsFilter filter = new FileExtensionsFilter();
-		filter.addFileExtension("htm"); //$NON-NLS-1$
-		filter.addFileExtension("html"); //$NON-NLS-1$
-		filter.addFileExtension("shtml"); //$NON-NLS-1$
-		filter.addFileExtension("xhtml"); //$NON-NLS-1$
-		dialog.addFilter(filter);
-		// Set the input as all workspace projects
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		dialog.setInput(root);
-		// Set the initial selection using the existing path (if any)
-		Path path = new Path(fHelpText.getText());
-		// Path must be non-empty, absolute and have at least two segments
-		if ((path.isEmpty() == false) && path.isAbsolute()
-				&& (path.segmentCount() > 1)) {
-			IFile helpDocumentFile = root.getFile(path);
-			dialog.setInitialSelection(helpDocumentFile);
-		}
-		// Open the dialog
-		if (dialog.open() == Window.OK) {
-			// Get the selection
-			Object result = dialog.getFirstResult();
-			// Ensure a file was selected
-			if (!(result instanceof IFile)) {
-				return;
-			}
-			IFile file = (IFile) result;
-			// Get the absolute path
-			String absolutePath = file.getFullPath().toPortableString();
-			// Update the field
-			fHelpText.setText(absolutePath);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.cheatsheet.simple.details.ISimpleCSDetails
-	 * #updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fHelpObject == null) {
-			return;
-		}
-
-		boolean editable = isEditableElement();
-		boolean expanded = false;
-
-		// Block model updates
-		fBlockListeners = true;
-		// Attribute: contextId
-		// Attribute: href
-		if (PDETextHelper.isDefined(fHelpObject.getContextId())) {
-			fHelpText.setText(fHelpObject.getContextId());
-			fHelpText.setToolTipText(fHelpObject.getContextId());
-			fHelpCombo.setText(F_HELP_CONTEXT_ID);
-			expanded = true;
-		} else if (PDETextHelper.isDefined(fHelpObject.getHref())) {
-			fHelpText.setText(fHelpObject.getHref());
-			fHelpText.setToolTipText(fHelpObject.getHref());
-			fHelpCombo.setText(F_HELP_DOCUMENT_LINK);
-			expanded = true;
-		} else {
-			fHelpCombo.setText(F_NO_HELP);
-		}
-		// Unblock model updates
-		fBlockListeners = false;
-
-		fHelpSection.setExpanded(expanded);
-		fHelpText.setEnabled(editable);
-		fHelpText.setVisible(expanded);
-		fHelpLabel.setVisible(expanded);
-		fHelpBrowse.setVisible(expanded);
-		fHelpCombo.setEnabled(editable);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// NO-OP
-		// No form entries
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java
deleted file mode 100755
index faf9143..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java
+++ /dev/null

@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSIntro;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSInputContext;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.parts.PDESourceViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.IFormColors;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * SimpleCSIntroDetails
- */
-public class SimpleCSIntroDetails extends CSAbstractDetails {
-
-	private ISimpleCSIntro fIntro;
-
-	private PDESourceViewer fContentViewer;
-
-	private Section fMainSection;
-
-	private SimpleCSHelpDetails fHelpSection;
-
-	private boolean fBlockEvents;
-
-	/**
-	 * @param elementSection
-	 */
-	public SimpleCSIntroDetails(ICSMaster elementSection) {
-		super(elementSection, SimpleCSInputContext.CONTEXT_ID);
-		fIntro = null;
-
-		fContentViewer = null;
-		fMainSection = null;
-		fHelpSection = new SimpleCSHelpDetails(elementSection);
-		fBlockEvents = false;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ISimpleCSIntro object) {
-		// Set data
-		fIntro = object;
-		// Set data on help section
-		fHelpSection.setData(object);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if ((object == null) || (object instanceof ISimpleCSIntro) == false) {
-			return;
-		}
-		// Set data
-		setData((ISimpleCSIntro) object);
-		// Update the UI given the new data
-		updateFields();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		super.initialize(form);
-		// Unfortunately this has to be explicitly called for sub detail
-		// sections through its main section parent; since, it never is 
-		// registered directly.
-		// Initialize managed form for help section
-		fHelpSection.initialize(form);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		GridData data = null;
-
-		// Create main section
-		fMainSection = getToolkit().createSection(parent, Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
-		fMainSection.clientVerticalSpacing = FormLayoutFactory.SECTION_HEADER_VERTICAL_SPACING;
-		fMainSection.setText(SimpleDetailsMessages.SimpleCSIntroDetails_mainSectionText);
-		fMainSection.setDescription(SimpleDetailsMessages.SimpleCSIntroDetails_mainSectionDesc);
-		fMainSection.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		fMainSection.setLayoutData(data);
-
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fMainSection);
-
-		// Create container for main section
-		Composite mainSectionClient = getToolkit().createComposite(fMainSection);
-		mainSectionClient.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
-
-		// description:  Content (Element)
-		createUIFieldContent(mainSectionClient);
-
-		// Bind widgets
-		getToolkit().paintBordersFor(mainSectionClient);
-		fMainSection.setClient(mainSectionClient);
-		markDetailsPart(fMainSection);
-
-		fHelpSection.createDetails(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIFieldContent(Composite parent) {
-		GridData data = null;
-		// Create the label
-		Color foreground = getToolkit().getColors().getColor(IFormColors.TITLE);
-		Label label = getToolkit().createLabel(parent, SimpleDetailsMessages.SimpleCSIntroDetails_attrBody, SWT.WRAP);
-		label.setForeground(foreground);
-		int style = GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_END;
-		data = new GridData(style);
-		label.setLayoutData(data);
-		// Create the source viewer
-		fContentViewer = new PDESourceViewer(getPage());
-		fContentViewer.createUI(parent, 90, 60);
-		// Needed to align vertically with form entry field and allow space
-		// for a possible field decoration			
-		((GridData) fContentViewer.getViewer().getTextWidget().getLayoutData()).horizontalIndent = FormLayoutFactory.CONTROL_HORIZONTAL_INDENT;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEDetails#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		return fContentViewer.doGlobalAction(actionId);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// description: Content (Element)
-		createUIListenersContentViewer();
-		fHelpSection.hookListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersContentViewer() {
-		fContentViewer.createUIListeners();
-		// Create document listener
-		fContentViewer.getDocument().addDocumentListener(new IDocumentListener() {
-			public void documentAboutToBeChanged(DocumentEvent event) {
-				// NO-OP
-			}
-
-			public void documentChanged(DocumentEvent event) {
-				// Check whether to handle this event
-				if (fBlockEvents) {
-					return;
-				}
-				// Ensure data object is defined
-				if (fIntro == null) {
-					return;
-				}
-				// Get the text from the event
-				IDocument document = event.getDocument();
-				if (document == null) {
-					return;
-				}
-				// Get the text from the event
-				String text = document.get().trim();
-
-				if (fIntro.getDescription() != null) {
-					fIntro.getDescription().setContent(text);
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fIntro == null) {
-			return;
-		}
-
-		fHelpSection.updateFields();
-
-		if (fIntro.getDescription() == null) {
-			return;
-		}
-
-		// description:  Content (Element)
-		fBlockEvents = true;
-		fContentViewer.getDocument().set(fIntro.getDescription().getContent());
-		fBlockEvents = false;
-
-		boolean editable = isEditableElement();
-		fContentViewer.getViewer().setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		// Set the context menu to null to prevent the editor context menu
-		// from being disposed along with the source viewer
-		if (fContentViewer != null) {
-			fContentViewer.unsetMenu();
-			fContentViewer = null;
-		}
-
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEDetails#canPaste(org.eclipse.swt.dnd.Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		return fContentViewer.canPaste();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		// No need to call for sub details, because they contain no form entries
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java
deleted file mode 100755
index 7dcd23e..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java
+++ /dev/null

@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import org.eclipse.jface.fieldassist.ControlDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSItem;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSInputContext;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.parts.PDESourceViewer;
-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.graphics.Color;
-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.ui.forms.IFormColors;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * SimpleCSItemDetails
- *
- */
-public class SimpleCSItemDetails extends CSAbstractDetails {
-
-	private ISimpleCSItem fItem;
-
-	private FormEntry fTitle;
-
-	private Button fSkip;
-
-	private PDESourceViewer fContentViewer;
-
-	private Section fMainSection;
-
-	private SimpleCSHelpDetails fHelpSection;
-
-	private SimpleCSCommandDetails fCommandSection;
-
-	private ControlDecoration fSkipInfoDecoration;
-
-	private boolean fBlockEvents;
-
-	/**
-	 * @param section
-	 */
-	public SimpleCSItemDetails(ICSMaster section) {
-		super(section, SimpleCSInputContext.CONTEXT_ID);
-		fItem = null;
-
-		fTitle = null;
-		fSkip = null;
-		fSkipInfoDecoration = null;
-		fContentViewer = null;
-		fMainSection = null;
-		fBlockEvents = false;
-
-		fHelpSection = new SimpleCSHelpDetails(section);
-		fCommandSection = new SimpleCSCommandDetails(section);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		super.initialize(form);
-		// Unfortunately this has to be explicitly called for sub detail
-		// sections through its main section parent; since, it never is 
-		// registered directly.
-		// Initialize managed form for help section
-		fHelpSection.initialize(form);
-		// Initialized managed form for command section
-		fCommandSection.initialize(form);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		Color foreground = getToolkit().getColors().getColor(IFormColors.TITLE);
-		GridData data = null;
-
-		// Create main section
-		fMainSection = getToolkit().createSection(parent, Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
-		fMainSection.clientVerticalSpacing = FormLayoutFactory.SECTION_HEADER_VERTICAL_SPACING;
-		fMainSection.setText(SimpleDetailsMessages.SimpleCSItemDetails_mainSectionText);
-		fMainSection.setDescription(SimpleDetailsMessages.SimpleCSItemDetails_mainSectionDesc);
-		fMainSection.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		fMainSection.setLayoutData(data);
-
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fMainSection);
-
-		// Create container for main section
-		Composite mainSectionClient = getToolkit().createComposite(fMainSection);
-		mainSectionClient.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
-
-		// Attribute: title
-		fTitle = new FormEntry(mainSectionClient, getToolkit(), SimpleDetailsMessages.SimpleCSItemDetails_attrTitle, SWT.NONE);
-
-		// description: Content (Element)
-		createUIFieldContent(mainSectionClient);
-
-		// Attribute: skip
-		fSkip = getToolkit().createButton(mainSectionClient, SimpleDetailsMessages.SimpleCSItemDetails_attrSkip, SWT.CHECK);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		fSkip.setLayoutData(data);
-		fSkip.setForeground(foreground);
-		createSkipInfoDecoration();
-		// Bind widgets
-		getToolkit().paintBordersFor(mainSectionClient);
-		fMainSection.setClient(mainSectionClient);
-		markDetailsPart(fMainSection);
-
-		fCommandSection.createDetails(parent);
-
-		fHelpSection.createDetails(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEDetails#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		return fContentViewer.doGlobalAction(actionId);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIFieldContent(Composite parent) {
-		GridData data = null;
-		// Create the label
-		Color foreground = getToolkit().getColors().getColor(IFormColors.TITLE);
-		Label label = getToolkit().createLabel(parent, SimpleDetailsMessages.SimpleCSItemDetails_label, SWT.WRAP);
-		label.setForeground(foreground);
-		int style = GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_END;
-		data = new GridData(style);
-		label.setLayoutData(data);
-		// Create the source viewer
-		fContentViewer = new PDESourceViewer(getPage());
-		fContentViewer.createUI(parent, 90, 60);
-		// Needed to align vertically with form entry field and allow space
-		// for a possible field decoration			
-		((GridData) fContentViewer.getViewer().getTextWidget().getLayoutData()).horizontalIndent = FormLayoutFactory.CONTROL_HORIZONTAL_INDENT;
-	}
-
-	/**
-	 * 
-	 */
-	private void createSkipInfoDecoration() {
-		// Skip info decoration
-		int bits = SWT.TOP | SWT.LEFT;
-		fSkipInfoDecoration = new ControlDecoration(fSkip, bits);
-		fSkipInfoDecoration.setMarginWidth(1);
-		fSkipInfoDecoration.setDescriptionText(SimpleDetailsMessages.SimpleCSItemDetails_disabled);
-		updateSkipInfoDecoration(false);
-		fSkipInfoDecoration.setImage(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_INFORMATION).getImage());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// description: Content (Element)
-		createUIListenersContentViewer();
-		// Attribute: title
-		fTitle.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fItem == null) {
-					return;
-				}
-				fItem.setTitle(fTitle.getValue());
-			}
-		});
-		// Attribute: skip
-		fSkip.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Ensure data object is defined
-				if (fItem == null) {
-					return;
-				}
-				fItem.setSkip(fSkip.getSelection());
-				getMasterSection().updateButtons();
-			}
-		});
-
-		fHelpSection.hookListeners();
-
-		fCommandSection.hookListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersContentViewer() {
-		fContentViewer.createUIListeners();
-		// Create document listener
-		fContentViewer.getDocument().addDocumentListener(new IDocumentListener() {
-			public void documentAboutToBeChanged(DocumentEvent event) {
-				// NO-OP
-			}
-
-			public void documentChanged(DocumentEvent event) {
-				// Check whether to handle this event
-				if (fBlockEvents) {
-					return;
-				}
-				// Ensure data object is defined
-				if (fItem == null) {
-					return;
-				}
-				// Get the text from the event
-				IDocument document = event.getDocument();
-				if (document == null) {
-					return;
-				}
-				// Get the text from the event
-				String text = document.get().trim();
-
-				if (fItem.getDescription() != null) {
-					fItem.getDescription().setContent(text);
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-
-		boolean editable = isEditableElement();
-		// Ensure data object is defined
-		if (fItem == null) {
-			return;
-		}
-		// Attribute: title
-		fTitle.setValue(fItem.getTitle(), true);
-		fTitle.setEditable(editable);
-
-		// Attribute: skip
-		fSkip.setSelection(fItem.getSkip());
-		updateSkipEnablement();
-		// TODO: MP: SimpleCS:  Revist all parameters and check we are simply looking for null - okay for non-String types
-		// TODO: MP: SimpleCS:  Reevaluate write methods and make sure not writing empty string
-
-		fHelpSection.updateFields();
-
-		fCommandSection.updateFields();
-
-		if (fItem.getDescription() == null) {
-			return;
-		}
-
-		// description:  Content (Element)
-		fBlockEvents = true;
-		String content = fItem.getDescription().getContent();
-		fContentViewer.getDocument().set(content == null ? "" : content);
-		fBlockEvents = false;
-		fContentViewer.getViewer().setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		// Set the context menu to null to prevent the editor context menu
-		// from being disposed along with the source viewer
-		if (fContentViewer != null) {
-			fContentViewer.unsetMenu();
-			fContentViewer = null;
-		}
-
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEDetails#canPaste(org.eclipse.swt.dnd.Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		return fContentViewer.canPaste();
-	}
-
-	/**
-	 * 
-	 */
-	private void updateSkipEnablement() {
-		// Ensure data object is defined
-		if (fItem == null) {
-			return;
-		}
-		boolean editable = isEditableElement();
-		// Preserve cheat sheet validity
-		// Semantic Rule:  Specifying whether an item can be skipped or not has
-		// no effect when subitems are present (because the item delegates the
-		// control to the subitem to skip).
-		if (fItem.hasSubItems()) {
-			editable = false;
-			updateSkipInfoDecoration(true);
-		} else {
-			updateSkipInfoDecoration(false);
-		}
-		fSkip.setEnabled(editable);
-	}
-
-	/**
-	 * @param show
-	 */
-	private void updateSkipInfoDecoration(boolean show) {
-		if (show) {
-			fSkipInfoDecoration.show();
-		} else {
-			fSkipInfoDecoration.hide();
-		}
-		fSkipInfoDecoration.setShowHover(show);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fTitle.commit();
-		// No need to call for sub details, because they contain no form entries
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if ((object == null) || (object instanceof ISimpleCSItem) == false) {
-			return;
-		}
-		// Set data
-		setData((ISimpleCSItem) object);
-		// Update the UI given the new data
-		updateFields();
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ISimpleCSItem object) {
-		// Set data
-		fItem = object;
-		// Set data on commands section
-		fCommandSection.setData(object);
-		// Set data on help section
-		fHelpSection.setData(object);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java
deleted file mode 100755
index dd4982b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSSubItem;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.CSAbstractDetails;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.ICSMaster;
-import org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.SimpleCSInputContext;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-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.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.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * SimpleCSSubItemDetails
- */
-public class SimpleCSSubItemDetails extends CSAbstractDetails {
-
-	private ISimpleCSSubItem fSubItem;
-
-	private FormEntry fLabel;
-
-	private Button fSkip;
-
-	private Section fMainSection;
-
-	private SimpleCSCommandDetails fCommandSection;
-
-	/**
-	 * @param elementSection
-	 */
-	public SimpleCSSubItemDetails(ICSMaster masterTreeSection) {
-		super(masterTreeSection, SimpleCSInputContext.CONTEXT_ID);
-		fSubItem = null;
-
-		fLabel = null;
-		fSkip = null;
-		fMainSection = null;
-		fCommandSection = new SimpleCSCommandDetails(masterTreeSection);
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(ISimpleCSSubItem object) {
-		// Set data
-		fSubItem = object;
-		// Set data on command section
-		fCommandSection.setData(object);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if ((object == null) || (object instanceof ISimpleCSSubItem) == false) {
-			return;
-		}
-		// Set data
-		setData((ISimpleCSSubItem) object);
-		// Update the UI given the new data
-		updateFields();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		super.initialize(form);
-		// Unfortunately this has to be explicitly called for sub detail
-		// sections through its main section parent; since, it never is 
-		// registered directly.
-		// Initialize managed form for command section
-		fCommandSection.initialize(form);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createDetails(Composite parent) {
-
-		GridData data = null;
-
-		// Create main section
-		fMainSection = getToolkit().createSection(parent, Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
-		fMainSection.clientVerticalSpacing = FormLayoutFactory.SECTION_HEADER_VERTICAL_SPACING;
-		fMainSection.setText(SimpleDetailsMessages.SimpleCSSubItemDetails_mainSectionText);
-		fMainSection.setDescription(SimpleDetailsMessages.SimpleCSSubItemDetails_mainSectionDesc);
-		fMainSection.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		fMainSection.setLayoutData(data);
-
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fMainSection);
-
-		// Create container for main section
-		Composite mainSectionClient = getToolkit().createComposite(fMainSection);
-		mainSectionClient.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
-
-		// Attribute: label
-		fLabel = new FormEntry(mainSectionClient, getToolkit(), SimpleDetailsMessages.SimpleCSSubItemDetails_attrBody, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.heightHint = 50;
-		fLabel.getText().setLayoutData(data);
-		data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_END);
-		fLabel.getLabel().setLayoutData(data);
-
-		// Attribute: skip
-		fSkip = getToolkit().createButton(mainSectionClient, SimpleDetailsMessages.SimpleCSSubItemDetails_attrSkip, SWT.CHECK);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		fSkip.setLayoutData(data);
-
-		// Bind widgets
-		getToolkit().paintBordersFor(mainSectionClient);
-		fMainSection.setClient(mainSectionClient);
-		markDetailsPart(fMainSection);
-
-		fCommandSection.createDetails(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		// Attribute: label
-		fLabel.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fSubItem == null) {
-					return;
-				}
-				fSubItem.setLabel(fLabel.getValue());
-			}
-		});
-		// Attribute: skip
-		fSkip.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fSubItem == null) {
-					return;
-				}
-				fSubItem.setSkip(fSkip.getSelection());
-			}
-		});
-
-		fCommandSection.hookListeners();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-
-		boolean editable = isEditableElement();
-		// Ensure data object is defined
-		if (fSubItem == null) {
-			return;
-		}
-		// Attribute: label
-		fLabel.setValue(fSubItem.getLabel(), true);
-		fLabel.setEditable(editable);
-
-		// Attribute: skip
-		fSkip.setSelection(fSubItem.getSkip());
-		fSkip.setEnabled(editable);
-
-		fCommandSection.updateFields();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fLabel.commit();
-		// No need to call for sub details, because they contain no form entries
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleDetailsMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleDetailsMessages.java
deleted file mode 100644
index acc7e7a..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleDetailsMessages.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details;
-
-import org.eclipse.osgi.util.NLS;
-
-public class SimpleDetailsMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.cheatsheet.simple.details.messages"; //$NON-NLS-1$
-	
-	public static String SimpleCSCommandDetails_attrCommand;
-	public static String SimpleCSCommandDetails_attrOptional;
-	public static String SimpleCSCommandDetails_attrParameters;
-	public static String SimpleCSCommandDetails_browse;
-	public static String SimpleCSCommandDetails_commandSectionDesc;
-	public static String SimpleCSCommandDetails_commandSectionText;
-	public static String SimpleCSCommandDetails_disabled;
-	public static String SimpleCSCommandDetails_errMsg;
-	public static String SimpleCSCommandDetails_errTitle;
-	public static String SimpleCSCommandDetails_name;
-	public static String SimpleCSCommandDetails_none;
-	public static String SimpleCSCommandDetails_value;
-	public static String SimpleCSDetails_attrTitle;
-	public static String SimpleCSDetails_mainSectionDesc;
-	public static String SimpleCSDetails_mainSetionTitle;
-	public static String SimpleCSHelpDetails_attrType;
-	public static String SimpleCSHelpDetails_attrValue;
-	public static String SimpleCSHelpDetails_browse;
-	public static String SimpleCSHelpDetails_dialogMessage;
-	public static String SimpleCSHelpDetails_dialogTitle;
-	public static String SimpleCSHelpDetails_helpContextID;
-	public static String SimpleCSHelpDetails_helpDocumentLink;
-	public static String SimpleCSHelpDetails_helpSectionDesc;
-	public static String SimpleCSHelpDetails_helpSectionText;
-	public static String SimpleCSHelpDetails_none;
-	public static String SimpleCSIntroDetails_attrBody;
-	public static String SimpleCSIntroDetails_mainSectionDesc;
-	public static String SimpleCSIntroDetails_mainSectionText;
-	public static String SimpleCSItemDetails_attrSkip;
-	public static String SimpleCSItemDetails_attrTitle;
-	public static String SimpleCSItemDetails_disabled;
-	public static String SimpleCSItemDetails_label;
-	public static String SimpleCSItemDetails_mainSectionDesc;
-	public static String SimpleCSItemDetails_mainSectionText;
-	public static String SimpleCSSubItemDetails_attrBody;
-	public static String SimpleCSSubItemDetails_attrSkip;
-	public static String SimpleCSSubItemDetails_mainSectionDesc;
-	public static String SimpleCSSubItemDetails_mainSectionText;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, SimpleDetailsMessages.class);
-	}
-
-	private SimpleDetailsMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/messages.properties
deleted file mode 100644
index 2aea7f7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/messages.properties
+++ /dev/null

@@ -1,38 +0,0 @@
-SimpleCSCommandDetails_attrCommand=Command:
-SimpleCSCommandDetails_attrOptional=This command is optional
-SimpleCSCommandDetails_attrParameters=Parameters:
-SimpleCSCommandDetails_browse=Browse...
-SimpleCSCommandDetails_commandSectionDesc=Optionally, add an executable workbench command to automate the task required by this step:
-SimpleCSCommandDetails_commandSectionText=Command
-SimpleCSCommandDetails_disabled=Field Disabled: An item that contains sub-steps cannot define a command
-SimpleCSCommandDetails_errMsg=Failed to deserialize command: 
-SimpleCSCommandDetails_errTitle=Command Deserialization Failure
-SimpleCSCommandDetails_name=Name
-SimpleCSCommandDetails_none=<none>
-SimpleCSCommandDetails_value=Value
-SimpleCSDetails_attrTitle=Title*: 
-SimpleCSDetails_mainSectionDesc=Specify the title display text of this cheat sheet.
-SimpleCSDetails_mainSetionTitle=Definition
-SimpleCSHelpDetails_attrType=Type:
-SimpleCSHelpDetails_attrValue=Value:
-SimpleCSHelpDetails_browse=Browse...
-SimpleCSHelpDetails_dialogMessage=Select a help document:
-SimpleCSHelpDetails_dialogTitle=Help Document Selection
-SimpleCSHelpDetails_helpContextID=Help Context ID
-SimpleCSHelpDetails_helpDocumentLink=Help Document Link
-SimpleCSHelpDetails_helpSectionDesc=Optionally, add a help link that will open related help in a separate window or browser when clicked:
-SimpleCSHelpDetails_helpSectionText=Help
-SimpleCSHelpDetails_none=<none>
-SimpleCSIntroDetails_attrBody=Body*:
-SimpleCSIntroDetails_mainSectionDesc=Specify the introduction display text of this cheat sheet:
-SimpleCSIntroDetails_mainSectionText=Definition
-SimpleCSItemDetails_attrSkip=This step is optional
-SimpleCSItemDetails_attrTitle=Title*:
-SimpleCSItemDetails_disabled=Field Disabled: An item that contains sub-steps cannot be made optional
-SimpleCSItemDetails_label=Body*:
-SimpleCSItemDetails_mainSectionDesc=Specify the title and body display text of this step:
-SimpleCSItemDetails_mainSectionText=Definition
-SimpleCSSubItemDetails_attrBody=Body*: 
-SimpleCSSubItemDetails_attrSkip=This sub-step is optional
-SimpleCSSubItemDetails_mainSectionDesc=Specify the body display text of this sub-step:
-SimpleCSSubItemDetails_mainSectionText=Definition

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/messages.properties
deleted file mode 100644
index 8129af0..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/messages.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-SimpleCSDefinitionPage_errorMessage=An error was encountered while parsing the cheat sheet XML file.
-SimpleCSDefinitionPage_loadFailure=Cheat Sheet Load Failure
-SimpleCSDefinitionPage_title=Definition
-SimpleCSMasterTreeSection_addStep=Add Step
-SimpleCSMasterTreeSection_addSubStep=Add Sub-Step
-SimpleCSMasterTreeSection_collapseAll=Collapse All
-SimpleCSMasterTreeSection_descriptionText1=Button Disabled: An item that contains a command cannot define sub-steps
-SimpleCSMasterTreeSection_descriptionText2=Button Disabled: An optional item cannot define sub-steps
-SimpleCSMasterTreeSection_down=Down
-SimpleCSMasterTreeSection_new=&New
-SimpleCSMasterTreeSection_preview=Preview
-SimpleCSMasterTreeSection_remove=Remove
-SimpleCSMasterTreeSection_sectionDescription=Edit the structure of this cheat sheet in the following section.
-SimpleCSMasterTreeSection_sectionTitle=Content
-SimpleCSMasterTreeSection_up=Up
-SimpleCSSourcePage_title=Source

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpBlock.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpBlock.java
deleted file mode 100644
index e69c5d5..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpBlock.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpCommand;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpContext;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpDescription;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpTopic;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details.*;
-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.forms.DetailsPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IDetailsPageProvider;
-import org.eclipse.ui.forms.IManagedForm;
-
-/**
- * Block containing the UI elements for the context editor.  Extends from PDEMasterDetailsBlock
- * which splits the editor into two areas, a tree section and a details section.
- * @since 3.4
- * @see CtxHelpTreeSection
- * @see CtxHelpAbstractDetails
- */
-public class CtxHelpBlock extends PDEMasterDetailsBlock implements IModelChangedListener, IDetailsPageProvider {
-
-	private CtxHelpTreeSection fMasterSection;
-
-	public CtxHelpBlock(PDEFormPage page) {
-		super(page);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock#createMasterSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)
-	 */
-	protected PDESection createMasterSection(IManagedForm managedForm, Composite parent) {
-		fMasterSection = new CtxHelpTreeSection(getPage(), parent);
-		return fMasterSection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.forms.DetailsPart)
-	 */
-	protected void registerPages(DetailsPart detailsPart) {
-		// Only static pages to be defined.  Do not cache pages
-		detailsPart.setPageLimit(0);
-		detailsPart.registerPage(CtxHelpContextDetails.class, new CtxHelpContextDetails(fMasterSection));
-		detailsPart.registerPage(CtxHelpDescriptionDetails.class, new CtxHelpDescriptionDetails(fMasterSection));
-		detailsPart.registerPage(CtxHelpTopicDetails.class, new CtxHelpTopicDetails(fMasterSection));
-		detailsPart.registerPage(CtxHelpCommandDetails.class, new CtxHelpCommandDetails(fMasterSection));
-		detailsPart.setPageProvider(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		if (fMasterSection != null) {
-			fMasterSection.modelChanged(event);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPage(java.lang.Object)
-	 */
-	public IDetailsPage getPage(Object key) {
-		// No dynamic pages.  Static pages already registered
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPageKey(java.lang.Object)
-	 */
-	public Object getPageKey(Object object) {
-		ISelection selection = getSelection();
-		if (!(selection instanceof IStructuredSelection) || ((IStructuredSelection) selection).size() > 1) {
-			return object.getClass();
-		}
-
-		if (object instanceof CtxHelpContext) {
-			return CtxHelpContextDetails.class;
-		} else if (object instanceof CtxHelpDescription) {
-			return CtxHelpDescriptionDetails.class;
-		} else if (object instanceof CtxHelpTopic) {
-			return CtxHelpTopicDetails.class;
-		} else if (object instanceof CtxHelpCommand) {
-			return CtxHelpCommandDetails.class;
-		}
-
-		return object.getClass();
-	}
-
-	/**
-	 * @return the current selection of the tree section
-	 */
-	public ISelection getSelection() {
-		if (fMasterSection != null) {
-			return fMasterSection.getSelection();
-		}
-		return StructuredSelection.EMPTY;
-	}
-
-	/**
-	 * @return the tree section
-	 */
-	public CtxHelpTreeSection getMasterSection() {
-		return fMasterSection;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpContentProvider.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpContentProvider.java
deleted file mode 100644
index 906cfc1..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpContentProvider.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-
-/**
- * Content provider for the tree section of the context help editor.  Gets the children of 
- * each element.
- * @since 3.4
- * @see CtxHelpTreeSection
- */
-public class CtxHelpContentProvider extends DefaultContentProvider implements ITreeContentProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof CtxHelpModel) {
-			CtxHelpObject root = ((CtxHelpModel) parentElement).getCtxHelpRoot();
-			return new Object[] {root};
-		} else if (parentElement instanceof CtxHelpObject) {
-			List list = ((CtxHelpObject) parentElement).getChildren();
-			return list.toArray();
-		}
-		return new Object[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof CtxHelpObject) {
-			return ((CtxHelpObject) element).getParent();
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return (getChildren(element).length > 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java
deleted file mode 100644
index 8bda6c0..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java
+++ /dev/null

@@ -1,388 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-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.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.ControlContribution;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpMarkerManager;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpTopic;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.wizards.ctxhelp.RegisterCtxHelpWizard;
-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.context.InputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.ui.part.ShowInContext;
-
-/**
- * Main UI class for the context help editor.  This editor provides a convenient way to
- * explore and edit the xml files containing context help entries.  The editor will
- * have two pages, one displaying the xml source, the other displaying a form editor.
- * @since 3.4
- * @see CtxHelpSourcePage
- * @see CtxHelpPage
- */
-public class CtxHelpEditor extends MultiSourceEditor {
-
-	public CtxHelpEditor() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getEditorID()
-	 */
-	protected String getEditorID() {
-		return IConstants.CONTEXT_HELP_EDITOR_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IShowInSource.class) {
-			if (inUiThread() && isShowInApplicable()) {
-				return getShowInSource();
-			}
-		}
-		if (adapter == IShowInTargetList.class) {
-			return getShowInTargetList();
-		}
-		return super.getAdapter(adapter);
-	}
-
-	/**
-	 * @return return whether the current thread is the UI thread
-	 */
-	private boolean inUiThread() {
-		Display display = getSite().getWorkbenchWindow().getWorkbench().getDisplay();
-		if (display != null && !display.isDisposed()) {
-			return display.getThread() == Thread.currentThread();
-		}
-		return false;
-	}
-
-	/**
-	 * @return whether there is a selection that requires the "Show In" menu to be available
-	 */
-	private boolean isShowInApplicable() {
-		if (getSelection().isEmpty()) {
-			return false;
-		}
-		if (getSelection() instanceof IStructuredSelection) {
-			IStructuredSelection selection = (IStructuredSelection) getSelection();
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				if (obj instanceof CtxHelpTopic && ((CtxHelpTopic) obj).getLocation() != null) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the <code>IShowInSource</code> for this editor.
-	 * @return the <code>IShowInSource</code> 
-	 */
-	private IShowInSource getShowInSource() {
-		return new IShowInSource() {
-			public ShowInContext getShowInContext() {
-				ArrayList resourceList = new ArrayList();
-				IStructuredSelection selection = (IStructuredSelection) getSelection();
-				IStructuredSelection resources;
-				if (selection.isEmpty()) {
-					resources = null;
-				} else {
-					IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-					for (Iterator iter = selection.iterator(); iter.hasNext();) {
-						Object obj = iter.next();
-						if (obj instanceof CtxHelpTopic) {
-							IPath path = ((CtxHelpTopic) obj).getLocation();
-							if (path != null && !path.isEmpty()) {
-								CtxHelpModel model = (CtxHelpModel) getAggregateModel();
-								IPath pluginPath = model.getUnderlyingResource().getProject().getFullPath();
-								IResource resource = root.findMember(pluginPath.append(path));
-								if (resource != null) {
-									resourceList.add(resource);
-								}
-							}
-						}
-					}
-					resources = new StructuredSelection(resourceList);
-				}
-				return new ShowInContext(null, resources);
-			}
-		};
-	}
-
-	/**
-	 * Returns the <code>IShowInTargetList</code> for this editor.
-	 * @return the <code>IShowInTargetList</code> 
-	 */
-	private IShowInTargetList getShowInTargetList() {
-		return new IShowInTargetList() {
-			public String[] getShowInTargetIds() {
-				return new String[] {JavaUI.ID_PACKAGES, IPageLayout.ID_RES_NAV};
-			}
-		};
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getContextIDForSaveAs()
-	 */
-	public String getContextIDForSaveAs() {
-		return CtxHelpInputContext.CONTEXT_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#addEditorPages()
-	 */
-	protected void addEditorPages() {
-		try {
-			addPage(new CtxHelpPage(this));
-		} catch (PartInitException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-		addSourcePage(CtxHelpInputContext.CONTEXT_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createContentOutline()
-	 */
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new CtxHelpFormOutlinePage(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createInputContextManager()
-	 */
-	protected InputContextManager createInputContextManager() {
-		return new CtxHelpInputContextManager(this);
-	}
-
-	/* (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 contexts, IFileEditorInput input) {
-		contexts.putContext(input, new CtxHelpInputContext(this, input, true));
-		contexts.monitorFile(input.getFile());
-	}
-
-	/* (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 contexts, IStorageEditorInput input) {
-		contexts.putContext(input, new CtxHelpInputContext(this, input, true));
-	}
-
-	/* (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 contexts, FileStoreEditorInput input) {
-		try {
-			IFileStore store = EFS.getStore(input.getURI());
-			IEditorInput in = new FileStoreEditorInput(store);
-			contexts.putContext(in, new CtxHelpInputContext(this, in, true));
-		} catch (CoreException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#editorContextAdded(org.eclipse.pde.internal.ui.editor.context.InputContext)
-	 */
-	public void editorContextAdded(InputContext context) {
-		// Add the source page
-		addSourcePage(context.getId());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		return fInputContextManager.findContext(CtxHelpInputContext.CONTEXT_ID);
-	}
-
-	/* (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(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileAdded(org.eclipse.core.resources.IFile)
-	 */
-	public void monitoredFileAdded(IFile monitoredFile) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileRemoved(org.eclipse.core.resources.IFile)
-	 */
-	public boolean monitoredFileRemoved(IFile monitoredFile) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getSelection()
-	 */
-	public ISelection getSelection() {
-		IFormPage formPage = getActivePageInstance();
-		if ((formPage != null) && (formPage instanceof CtxHelpPage)) {
-			// Synchronizes the selection made in the master tree view with the
-			// selection in the outline view when the link with editor button
-			// is toggled on
-			return ((CtxHelpPage) formPage).getSelection();
-		}
-		return super.getSelection();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#canCut(org.eclipse.jface.viewers.ISelection)
-	 */
-	public boolean canCut(ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection sel = (IStructuredSelection) selection;
-			for (Iterator iter = sel.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				if (obj instanceof CtxHelpObject && ((CtxHelpObject) obj).canBeRemoved()) {
-					return canCopy(selection);
-				}
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.MultiSourceEditor#createSourcePage(org.eclipse.pde.internal.ui.editor.PDEFormEditor, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		return new CtxHelpSourcePage(editor, title, name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#contributeToToolbar(org.eclipse.jface.action.IToolBarManager)
-	 */
-	public void contributeToToolbar(IToolBarManager manager) {
-		if (getAggregateModel().isEditable()) {
-			manager.add(new ControlContribution("Register") { //$NON-NLS-1$
-						protected Control createControl(Composite parent) {
-							ImageHyperlink fImageHyperlinkRegisterTOC = new ImageHyperlink(parent, SWT.NONE);
-							fImageHyperlinkRegisterTOC.setText(CtxHelpMessages.CtxHelpEditor_text);
-							fImageHyperlinkRegisterTOC.setUnderlined(true);
-							fImageHyperlinkRegisterTOC.setForeground(getToolkit().getHyperlinkGroup().getForeground());
-							fImageHyperlinkRegisterTOC.addHyperlinkListener(new IHyperlinkListener() {
-								public void linkActivated(HyperlinkEvent e) {
-									handleRegisterCtxHelpFile();
-								}
-
-								public void linkEntered(HyperlinkEvent e) {
-									((ImageHyperlink) e.getSource()).setForeground(getToolkit().getHyperlinkGroup().getActiveForeground());
-									getEditorSite().getActionBars().getStatusLineManager().setMessage(CtxHelpMessages.CtxHelpEditor_text);
-								}
-
-								public void linkExited(HyperlinkEvent e) {
-									((ImageHyperlink) e.getSource()).setForeground(getToolkit().getHyperlinkGroup().getForeground());
-									getEditorSite().getActionBars().getStatusLineManager().setMessage(null);
-								}
-							});
-							return fImageHyperlinkRegisterTOC;
-						}
-					});
-		}
-	}
-
-	/**
-	 * Opens the register context help wizard dialog.
-	 */
-	private void handleRegisterCtxHelpFile() {
-		RegisterCtxHelpWizard wizard = new RegisterCtxHelpWizard((IModel) getAggregateModel());
-		WizardDialog dialog = new WizardDialog(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		dialog.getShell().setSize(400, 250);
-		dialog.open();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		CtxHelpModel model = (CtxHelpModel) getAggregateModel();
-		model.setMarkerRefreshNeeded(true);
-
-		super.doSave(monitor);
-		model.reconciled(model.getDocument()); //model recon occurs async so we can proceed to save
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#dispose()
-	 */
-	public void dispose() {
-		//editor is closing, delete the markers
-		CtxHelpMarkerManager.deleteMarkers((CtxHelpModel) getAggregateModel());
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createInputContexts(org.eclipse.pde.internal.ui.editor.context.InputContextManager)
-	 */
-	protected void createInputContexts(InputContextManager contextManager) {
-		super.createInputContexts(contextManager);
-
-		// model is loaded, create markers if there were errors found
-		CtxHelpMarkerManager.createMarkers((CtxHelpModel) getAggregateModel());
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpFormOutlinePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpFormOutlinePage.java
deleted file mode 100644
index 609389d..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpFormOutlinePage.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-
-/**
- * The outline page for the context help editor
- * @since 3.4
- * @see CtxHelpEditor
- */
-public class CtxHelpFormOutlinePage extends FormOutlinePage {
-
-	public CtxHelpFormOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/**
-	 * Label provider for the outline
-	 * @author cwindatt
-	 *
-	 */
-	private class CtxHelpLabelProvider extends BasicLabelProvider {
-		public CtxHelpLabelProvider(ILabelProvider ilp) {
-			super(ilp);
-		}
-
-		public String getText(Object obj) {
-			if (obj instanceof CtxHelpObject) {
-				return PDETextHelper.translateReadText(((CtxHelpObject) obj).getName());
-			}
-			return super.getText(obj);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getChildren(java.lang.Object)
-	 */
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof CtxHelpPage) {
-			CtxHelpModel model = (CtxHelpModel) fEditor.getAggregateModel();
-			if (model != null && model.isLoaded()) {
-				Object[] list = new Object[1];
-				list[0] = model.getCtxHelpRoot();
-				return list;
-			}
-		} else if (parent instanceof CtxHelpObject) {
-			List list = ((CtxHelpObject) parent).getChildren();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-
-		return super.getChildren(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#createLabelProvider()
-	 */
-	public ILabelProvider createLabelProvider() {
-		return new CtxHelpLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getParentPageId(java.lang.Object)
-	 */
-	protected String getParentPageId(Object item) {
-		return CtxHelpPage.PAGE_ID;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContext.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContext.java
deleted file mode 100644
index 83c617c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContext.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-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.internal.core.text.AbstractEditingModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
-import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput;
-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;
-import org.eclipse.ui.IURIEditorInput;
-
-/**
- * The input context for the context help editor, based on an xml file containing
- * help context ids.
- * @since 3.4
- */
-public class CtxHelpInputContext extends XMLInputContext {
-
-	public static final String CONTEXT_ID = "ctxhelp-context"; //$NON-NLS-1$	
-
-	public CtxHelpInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		if (input instanceof IStorageEditorInput) {
-			boolean isReconciling = input instanceof IFileEditorInput;
-			IDocument document = getDocumentProvider().getDocument(input);
-
-			CtxHelpModel model = new CtxHelpModel(document, isReconciling);
-
-			if (input instanceof IFileEditorInput) {
-				IFile file = ((IFileEditorInput) input).getFile();
-				model.setUnderlyingResource(file);
-				model.setCharset(file.getCharset());
-			} else if (input instanceof IURIEditorInput) {
-				IFileStore store = EFS.getStore(((IURIEditorInput) input).getURI());
-				model.setInstallLocation(store.getParent().getParent().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;
-		}
-
-		return null;
-	}
-
-	/* (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.XMLInputContext#reorderInsertEdits(java.util.ArrayList)
-	 */
-	protected void reorderInsertEdits(ArrayList ops) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#doRevert()
-	 */
-	public void doRevert() {
-		// TODO we should move this up the stack....
-		fEditOperations.clear();
-		fOperationTable.clear();
-		fMoveOperations.clear();
-		AbstractEditingModel model = (AbstractEditingModel) getModel();
-		model.reconciled(model.getDocument());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#getPartitionName()
-	 */
-	protected String getPartitionName() {
-		return "___ctxhelp_partition"; //$NON-NLS-1$
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContextManager.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContextManager.java
deleted file mode 100644
index 9d7d334..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpInputContextManager.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-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;
-
-/**
- * Input context manager for the context help editor.
- * @since 3.4
- * @see CtxHelpEditor
- */
-public class CtxHelpInputContextManager extends InputContextManager {
-
-	public CtxHelpInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContextManager#getAggregateModel()
-	 */
-	public IBaseModel getAggregateModel() {
-		InputContext context = findContext(CtxHelpInputContext.CONTEXT_ID);
-		if (context == null) {
-			return null;
-		}
-		return context.getModel();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpMessages.java
deleted file mode 100644
index 50e0d58..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpMessages.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CtxHelpMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.ctxhelp.messages"; //$NON-NLS-1$
-	
-	public static String CtxHelpEditor_text;
-	public static String CtxHelpPage_errMsg;
-	public static String CtxHelpPage_errTitle;
-	public static String CtxHelpPage_formText;
-	public static String CtxHelpPage_title;
-	public static String CtxHelpSourcePage_name;
-	public static String CtxHelpTreeSection_0;
-	public static String CtxHelpTreeSection_1;
-	public static String CtxHelpTreeSection_10;
-	public static String CtxHelpTreeSection_11;
-	public static String CtxHelpTreeSection_12;
-	public static String CtxHelpTreeSection_13;
-	public static String CtxHelpTreeSection_14;
-	public static String CtxHelpTreeSection_15;
-	public static String CtxHelpTreeSection_16;
-	public static String CtxHelpTreeSection_17;
-	public static String CtxHelpTreeSection_18;
-	public static String CtxHelpTreeSection_19;
-	public static String CtxHelpTreeSection_2;
-	public static String CtxHelpTreeSection_20;
-	public static String CtxHelpTreeSection_21;
-	public static String CtxHelpTreeSection_22;
-	public static String CtxHelpTreeSection_23;
-	public static String CtxHelpTreeSection_3;
-	public static String CtxHelpTreeSection_4;
-	public static String CtxHelpTreeSection_5;
-	public static String CtxHelpTreeSection_6;
-	public static String CtxHelpTreeSection_7;
-	public static String CtxHelpTreeSection_8;
-	public static String CtxHelpTreeSection_9;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, CtxHelpMessages.class);
-	}
-
-	private CtxHelpMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java
deleted file mode 100644
index 8a4db78..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpPage.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * The main page for the context help editor. Contains a tree displaying the
- * structure of the xml and a details section. UI elements are handled by
- * CtxHelpBlock.
- * 
- * @since 3.4
- * @see CtxHelpEditor
- * @see CtxHelpBlock
- */
-public class CtxHelpPage extends PDEFormPage implements IModelChangedListener {
-	public static final String PAGE_ID = "ctxHelpPage"; //$NON-NLS-1$
-
-	private CtxHelpBlock fBlock;
-
-	public CtxHelpPage(FormEditor editor) {
-		super(editor, PAGE_ID, CtxHelpMessages.CtxHelpPage_title);
-		fBlock = new CtxHelpBlock(this);
-	}
-
-	/**
-	 * @return the CtxHelpBlock containing ui elements
-	 */
-	public PDEMasterDetailsBlock getBlock() {
-		return fBlock;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.
-	 * eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		ScrolledForm form = managedForm.getForm();
-		CtxHelpModel model = (CtxHelpModel) getModel();
-
-		// Ensure the model was loaded properly
-		if ((model == null) || (model.isLoaded() == false)) {
-			createErrorContent(managedForm);
-		}
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.CTX_HELP_EDITOR);
-
-		// Create the rest of the actions in the form title area
-		super.createFormContent(managedForm);
-		// Form image
-		form.setImage(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().get(PDEUserAssistanceUIPluginImages.DESC_CTXHELP_CONTEXT_OBJ));
-		form.setText(CtxHelpMessages.CtxHelpPage_formText);
-		// Create the master details block
-		fBlock.createContent(managedForm);
-		// Force the selection in the masters tree section to load the
-		// proper details section
-		fBlock.getMasterSection().fireSelection();
-		// Register this page to be informed of model change events
-		model.addModelChangedListener(this);
-	}
-
-	private void createErrorContent(IManagedForm managedForm) {
-		// Add error meesage to the form
-		ScrolledForm form = managedForm.getForm();
-		form.setMessage(CtxHelpMessages.CtxHelpPage_errMsg, IMessageProvider.ERROR);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#dispose()
-	 */
-	public void dispose() {
-		CtxHelpModel model = (CtxHelpModel) getModel();
-		if (model != null) {
-			model.removeModelChangedListener(this);
-		}
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde
-	 * .core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		fBlock.modelChanged(event);
-	}
-
-	/**
-	 * @return the current selection of the ui block
-	 */
-	public ISelection getSelection() {
-		return fBlock.getSelection();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#setActive(boolean)
-	 */
-	public void setActive(boolean active) {
-		super.setActive(active);
-		if (active) {
-			CtxHelpModel model = (CtxHelpModel) getModel();
-			if ((model == null) || (model.isLoaded() == false)) {
-				createErrorContent(getManagedForm());
-			} else {
-				// Clear the error message
-				getManagedForm().getForm().setMessage("", IMessageProvider.NONE);
-			}
-
-			IFormPage page = getPDEEditor().findPage(CtxHelpInputContext.CONTEXT_ID);
-			if (page instanceof CtxHelpSourcePage && ((CtxHelpSourcePage) page).getInputContext().isInSourceMode()) {
-				ISourceViewer viewer = ((CtxHelpSourcePage) page).getViewer();
-				if (viewer == null) {
-					return;
-				}
-
-				StyledText text = viewer.getTextWidget();
-				if (text == null) {
-					return;
-				}
-
-				int offset = text.getCaretOffset();
-				if (offset < 0) {
-					return;
-				}
-
-				IDocumentRange range = ((CtxHelpSourcePage) page).getRangeElement(offset, true);
-				if (range instanceof IDocumentAttributeNode) {
-					range = ((IDocumentAttributeNode) range).getEnclosingElement();
-				} else if (range instanceof IDocumentTextNode) {
-					range = ((IDocumentTextNode) range).getEnclosingElement();
-				}
-
-				if (range instanceof CtxHelpObject) {
-					fBlock.getMasterSection().setSelection(new StructuredSelection(range));
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#getHelpResource()
-	 */
-	protected String getHelpResource() {
-		return IHelpContextIds.CTX_HELP_EDITOR;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpSourcePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpSourcePage.java
deleted file mode 100644
index dec29ec..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpSourcePage.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.XMLSourcePage;
-
-/**
- * Source page for the context help editor.  Displays the
- * xml source.
- * @since 3.4
- * @see CtxHelpEditor
- */
-public class CtxHelpSourcePage extends XMLSourcePage {
-
-	public CtxHelpSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEProjectionSourcePage#isQuickOutlineEnabled()
-	 */
-	public boolean isQuickOutlineEnabled() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineComparator()
-	 */
-	public ViewerComparator createOutlineComparator() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineContentProvider()
-	 */
-	public ITreeContentProvider createOutlineContentProvider() {
-		return new CtxHelpContentProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineLabelProvider()
-	 */
-	public ILabelProvider createOutlineLabelProvider() {
-		return PDEUserAssistanceUIPlugin.getDefault().getLabelProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#setPartName(java.lang.String)
-	 */
-	protected void setPartName(String partName) {
-		super.setPartName(CtxHelpMessages.CtxHelpSourcePage_name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#updateSelection(java.lang.Object)
-	 */
-	public void updateSelection(Object object) {
-		if ((object instanceof IDocumentElementNode) && !((IDocumentElementNode) object).isErrorNode()) {
-			setSelectedObject(object);
-			setHighlightRange((IDocumentElementNode) object, true);
-			setSelectedRange((IDocumentElementNode) object, false);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#findRange()
-	 */
-	protected IDocumentRange findRange() {
-		if (getSelection() instanceof IDocumentElementNode) {
-			return (IDocumentElementNode) getSelection();
-		}
-
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#getRangeElement(int, boolean)
-	 */
-	public IDocumentRange getRangeElement(int offset, boolean searchChildren) {
-		CtxHelpObject root = ((CtxHelpModel) getInputContext().getModel()).getCtxHelpRoot();
-		return findNode(root, offset, searchChildren);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#synchronizeOutlinePage(int)
-	 */
-	protected void synchronizeOutlinePage(int offset) {
-		IDocumentRange rangeElement = getRangeElement(offset, true);
-		updateHighlightRange(rangeElement);
-		// TODO: MP: TEO: LOW: Generalize for parent - search children = true and handle attributes
-		if (rangeElement instanceof IDocumentAttributeNode) {
-			rangeElement = ((IDocumentAttributeNode) rangeElement).getEnclosingElement();
-		}
-		updateOutlinePageSelection(rangeElement);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.editors.text.TextEditor#initializeEditor()
-	 */
-	protected void initializeEditor() {
-		super.initializeEditor();
-		// TODO Fix help context
-		//		setHelpContextId(IHelpContextIds.TOC_EDITOR);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpTreeSection.java
deleted file mode 100644
index e1b2f32..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpTreeSection.java
+++ /dev/null

@@ -1,935 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.ctxhelp.ICtxHelpConstants;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.*;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details.CtxHelpAbstractAddAction;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details.CtxHelpRemoveAction;
-import org.eclipse.pde.internal.ua.ui.editor.toc.HelpEditorUtil;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TreeSection;
-import org.eclipse.pde.internal.ui.editor.actions.CollapseAction;
-import org.eclipse.pde.internal.ui.editor.plugin.FormFilteredTree;
-import org.eclipse.pde.internal.ui.parts.TreePart;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ContributionItemFactory;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.keys.IBindingService;
-
-/**
- * Tree section for the context help editor.  Displays the structure
- * of the xml file and adds actions allowing manipulation of the structure.
- * @since 3.4
- * @see CtxHelpEditor
- */
-public class CtxHelpTreeSection extends TreeSection {
-	private CtxHelpModel fModel;
-	private TreeViewer fTree;
-	private FormFilteredTree fFilteredTree;
-
-	/* The indices for each button attached to the Tree Viewer.
-	 * This type of UI form does not permit direct access to each particular
-	 * button. However, using these indices, one can perform any typical SWT
-	 * operation on any button.
-	 */
-	private static final int F_BUTTON_ADD_CONTEXT = 0;
-	private static final int F_BUTTON_ADD_TOPIC = 2;
-	private static final int F_BUTTON_ADD_COMMAND = 3;
-	private static final int F_BUTTON_REMOVE = 5;
-	private static final int F_BUTTON_UP = 6;
-	private static final int F_BUTTON_DOWN = 7;
-
-	// When one of the move buttons is pressed, a flag is used to determine the direction
-	private static final int F_UP_FLAG = -1;
-	private static final int F_DOWN_FLAG = 1;
-
-	// The actions that will add each type of object
-	private CtxHelpAbstractAddAction fAddContextAction;
-	private CtxHelpAbstractAddAction fAddTopicAction;
-	private CtxHelpAbstractAddAction fAddCommandAction;
-
-	// The object removal action
-	private CtxHelpRemoveAction fRemoveObjectAction;
-
-	// The action for opening a link from the context menu
-	private OpenLinkAction fOpenLinkAction;
-
-	// Used to temporarily store the target of a drop operation 
-	// so that it does not have be be recalculated
-	private CtxHelpObject fDropTargetParent;
-	private CtxHelpObject fDropTargetSibling;
-
-	/** If items are dragged and dropped within this tree, then
-	 * this flag inhibits reselection on the removal (drag) action,
-	 * thus ensuring that the selected objects are the ones that were
-	 * dropped.
-	 */
-	private boolean fDragFromHere;
-
-	/**
-	 * Action that allows a linked file to be opened in the editor
-	 * @since 3.4
-	 */
-	class OpenLinkAction extends Action {
-		private CtxHelpTopic fOpenTarget;
-
-		public OpenLinkAction() {
-			super(CtxHelpMessages.CtxHelpTreeSection_0);
-		}
-
-		public void setTarget(CtxHelpTopic target) {
-			fOpenTarget = target;
-		}
-
-		public void run() {
-			if (fOpenTarget != null) {
-				open(fOpenTarget);
-			}
-		}
-	}
-
-	public CtxHelpTreeSection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, new String[] {CtxHelpMessages.CtxHelpTreeSection_1, null, CtxHelpMessages.CtxHelpTreeSection_2, CtxHelpMessages.CtxHelpTreeSection_3, null, CtxHelpMessages.CtxHelpTreeSection_4, CtxHelpMessages.CtxHelpTreeSection_5, CtxHelpMessages.CtxHelpTreeSection_6});
-	}
-
-	/* (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) {
-		fModel = (CtxHelpModel) getPage().getModel();
-
-		Composite container = createClientContainer(section, 2, toolkit);
-		createTree(container, toolkit);
-		toolkit.paintBordersFor(container);
-
-		section.setText(CtxHelpMessages.CtxHelpTreeSection_7);
-		section.setDescription(CtxHelpMessages.CtxHelpTreeSection_8);
-		section.setClient(container);
-
-		createCommands();
-
-		initializeTreeViewer();
-		createSectionToolbar(section, toolkit);
-
-		// Create the adapted listener for the filter entry field
-		fFilteredTree.createUIListenerEntryFilter(this);
-	}
-
-	/**
-	 * Creates the commands used in this section.
-	 */
-	private void createCommands() {
-		fAddContextAction = new CtxHelpAbstractAddAction() {
-			public void run() {
-				if (fParentObject != null) {
-					CtxHelpContext context = fParentObject.getModel().getFactory().createContext();
-					String id = PDELabelUtility.generateName(getChildNames(), CtxHelpMessages.CtxHelpTreeSection_9);
-					context.setID(id);
-					addChild(context);
-				}
-			}
-		};
-		fAddContextAction.setText(CtxHelpMessages.CtxHelpTreeSection_10);
-		fAddTopicAction = new CtxHelpAbstractAddAction() {
-			public void run() {
-				if (fParentObject != null) {
-					CtxHelpTopic topic = fParentObject.getModel().getFactory().createTopic();
-					String label = PDELabelUtility.generateName(getChildNames(), CtxHelpMessages.CtxHelpTreeSection_11);
-					topic.setLabel(label);
-					addChild(topic);
-				}
-			}
-		};
-		fAddTopicAction.setText(CtxHelpMessages.CtxHelpTreeSection_12);
-		fAddCommandAction = new CtxHelpAbstractAddAction() {
-			public void run() {
-				if (fParentObject != null) {
-					CtxHelpCommand command = fParentObject.getModel().getFactory().createCommand();
-					String label = PDELabelUtility.generateName(getChildNames(), CtxHelpMessages.CtxHelpTreeSection_13);
-					command.setLabel(label);
-					addChild(command);
-				}
-			}
-		};
-		fAddCommandAction.setText(CtxHelpMessages.CtxHelpTreeSection_14);
-
-		fRemoveObjectAction = new CtxHelpRemoveAction();
-		fOpenLinkAction = new OpenLinkAction();
-	}
-
-	/**
-	 * Adds a link (with hand cursor) for tree 'Collapse All' action,
-	 * which collapses the tree down to the second level
-	 * 
-	 * @param section The section that the toolbar will belong to
-	 * @param toolkit The toolkit that will be used to make the toolbar
-	 */
-	private void createSectionToolbar(Section section, FormToolkit toolkit) {
-		ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
-		ToolBar toolbar = toolBarManager.createControl(section);
-
-		final Cursor handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
-		toolbar.setCursor(handCursor);
-		// Cursor needs to be explicitly disposed
-		toolbar.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if ((handCursor != null) && (handCursor.isDisposed() == false)) {
-					handCursor.dispose();
-				}
-			}
-		});
-
-		// Add collapse action to the tool bar
-		toolBarManager.add(new CollapseAction(fTree, CtxHelpMessages.CtxHelpTreeSection_15, 1, fModel.getCtxHelpRoot()));
-		toolBarManager.update(true);
-		section.setTextClient(toolbar);
-	}
-
-	/**
-	 * Create the tree widget that will contain the structure
-	 * 
-	 * @param container The container of the tree widget
-	 * @param toolkit The toolkit used to create the tree
-	 */
-	private void createTree(Composite container, FormToolkit toolkit) {
-		TreePart treePart = getTreePart();
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-
-		fTree = treePart.getTreeViewer();
-		fTree.setContentProvider(new CtxHelpContentProvider());
-		fTree.setLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-
-		PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().connect(this);
-
-		// Create listener for the outline view 'link with editor' toggle button
-		fTree.addPostSelectionChangedListener(getPage().getPDEEditor().new PDEFormEditorChangeListener());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#createTreeViewer(org.eclipse.swt.widgets.Composite, int)
-	 */
-	protected TreeViewer createTreeViewer(Composite parent, int style) {
-		fFilteredTree = new FormFilteredTree(parent, style, new PatternFilter());
-		parent.setData("filtered", Boolean.TRUE); //$NON-NLS-1$
-		return fFilteredTree.getViewer();
-	}
-
-	/**
-	 * Initialize the tree viewer widget and its buttons.
-	 */
-	private void initializeTreeViewer() {
-		if (fModel == null) {
-			return;
-		}
-
-		CtxHelpRoot root = fModel.getCtxHelpRoot();
-		fTree.setInput(root);
-
-		// Buttons must be disabled if file is not editable
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_CONTEXT, isEditable());
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_COMMAND, isEditable());
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_TOPIC, isEditable());
-
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, false);
-		getTreePart().setButtonEnabled(F_BUTTON_UP, false);
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#setFormInput(java.lang.Object)
-	 */
-	public boolean setFormInput(Object object) {
-		// This method allows the outline view to select items in the tree
-		// (Invoked by org.eclipse.ui.forms.editor.IFormPage.selectReveal(Object object))
-		if (object instanceof CtxHelpObject) {
-			fTree.setSelection(new StructuredSelection(object), true);
-
-			// Verify that something was actually selected
-			ISelection selection = fTree.getSelection();
-			if (selection != null && !selection.isEmpty()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return the selection of the tree
-	 */
-	public ISelection getSelection() {
-		return fTree.getSelection();
-	}
-
-	/**
-	 * @param selection the new selection for the tree section
-	 */
-	public void setSelection(ISelection selection) {
-		fTree.setSelection(selection);
-	}
-
-	/**
-	 * Fire a selection change event and refresh the viewer's selection
-	 */
-	public void fireSelection() {
-		fTree.setSelection(fTree.getSelection());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-
-	/**
-	 * Update the buttons in the section based on the current selection
-	 */
-	public void updateButtons() {
-		if (!fModel.isEditable()) {
-			return;
-		}
-
-		IStructuredSelection selection = (IStructuredSelection) fTree.getSelection();
-		CtxHelpObject firstSelectedObject = (CtxHelpObject) selection.getFirstElement();
-
-		// Add Context
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_CONTEXT, true);
-
-		// Add Topic
-		boolean enableAdd = false;
-		if (firstSelectedObject != null) {
-			if (firstSelectedObject.canAddSibling(ICtxHelpConstants.TYPE_TOPIC)) {
-				enableAdd = true;
-			} else if (firstSelectedObject.canAddChild(ICtxHelpConstants.TYPE_TOPIC)) {
-				enableAdd = true;
-			}
-		}
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_TOPIC, enableAdd);
-
-		// Add Command
-		enableAdd = false;
-		if (firstSelectedObject != null) {
-			if (firstSelectedObject.canAddSibling(ICtxHelpConstants.TYPE_COMMAND)) {
-				enableAdd = true;
-			} else if (firstSelectedObject.canAddChild(ICtxHelpConstants.TYPE_COMMAND)) {
-				enableAdd = true;
-			}
-		}
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_COMMAND, enableAdd);
-
-		// Remove button
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, getRemovableObjectFromSelection(selection).size() > 0);
-
-		// Up and Down buttons
-		boolean canMoveUp = true;
-		boolean canMoveDown = true;
-		if (firstSelectedObject == null || firstSelectedObject.getType() == ICtxHelpConstants.TYPE_ROOT || firstSelectedObject.getType() == ICtxHelpConstants.TYPE_DESCRIPTION || selection.size() > 1) {
-			canMoveUp = false;
-			canMoveDown = false;
-		} else {
-			CtxHelpObject parent = firstSelectedObject.getParent();
-			if (parent != null) {
-				int index = parent.indexOf(firstSelectedObject);
-				if (index == 0) {
-					canMoveUp = false;
-				}
-				if (index >= parent.getChildCount() - 1) {
-					canMoveDown = false;
-				}
-			}
-		}
-		getTreePart().setButtonEnabled(F_BUTTON_UP, canMoveUp);
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, canMoveDown);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		IStructuredSelection selection = (IStructuredSelection) fTree.getSelection();
-		Object object = selection.getFirstElement();
-		// Has to be null or a CtxHelpObject object
-		CtxHelpObject firstSelectedObject = (CtxHelpObject) object;
-
-		// Populate the "New" sub-menu
-		if (firstSelectedObject != null) {
-			MenuManager submenu = new MenuManager(CtxHelpMessages.CtxHelpTreeSection_16);
-			boolean addMenu = false;
-			if (updateAddContextActionWithSelection(firstSelectedObject)) {
-				submenu.add(fAddContextAction);
-				addMenu = true;
-			}
-			if (updateAddTopicActionWithSelection(firstSelectedObject)) {
-				submenu.add(fAddTopicAction);
-				addMenu = true;
-			}
-			if (updateAddCommandActionWithSelection(firstSelectedObject)) {
-				submenu.add(fAddCommandAction);
-				addMenu = true;
-			}
-			if (addMenu) {
-				manager.add(submenu);
-				manager.add(new Separator());
-			}
-		}
-
-		// Add the open link and show in actions
-		if (firstSelectedObject instanceof CtxHelpTopic && ((CtxHelpTopic) firstSelectedObject).getLocation() != null) {
-			fOpenLinkAction.setTarget((CtxHelpTopic) firstSelectedObject);
-			manager.add(fOpenLinkAction);
-			fillContextMenuShowInAction(manager);
-			manager.add(new Separator());
-		}
-
-		// Add clipboard actions
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-		manager.add(new Separator());
-
-		// Add remove action
-		if (updateRemoveActionWithSelection(selection)) {
-			manager.add(fRemoveObjectAction);
-			manager.add(new Separator());
-		}
-
-	}
-
-	/**
-	 * Creates and a new submenu in the given menu manager and adds actions to
-	 * allow a linked file to be opened in various views.
-	 * @param manager menu manager to add the submenu to
-	 */
-	private void fillContextMenuShowInAction(IMenuManager manager) {
-		String showInLabel = CtxHelpMessages.CtxHelpTreeSection_17;
-
-		// Add a label for the keybinding for Show In action, if one exists
-		IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
-		if (bindingService != null) {
-			String keyBinding = bindingService.getBestActiveBindingFormattedFor("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
-			if (keyBinding != null) {
-				showInLabel += '\t' + keyBinding;
-			}
-		}
-
-		IMenuManager showInMenu = new MenuManager(showInLabel);
-		showInMenu.add(ContributionItemFactory.VIEWS_SHOW_IN.create(getPage().getSite().getWorkbenchWindow()));
-
-		manager.add(showInMenu);
-	}
-
-	/**
-	 * Updates the add context action if the action should be available for the selection.
-	 * Updates enablement, parent object and target object.  Returns true if the action
-	 * should be available to the selection. 
-	 * @param selectedObject selected object
-	 * @return true if the action should be available for the current selection, false otherwise
-	 */
-	private boolean updateAddContextActionWithSelection(CtxHelpObject selectedObject) {
-		if (selectedObject != null && selectedObject.canAddSibling(ICtxHelpConstants.TYPE_CONTEXT)) {
-			fAddContextAction.setParentObject(selectedObject.getParent());
-			fAddContextAction.setTargetObject(selectedObject);
-			fAddContextAction.setEnabled(fModel.isEditable());
-			return true;
-		} else if (selectedObject != null && selectedObject.canAddChild(ICtxHelpConstants.TYPE_CONTEXT)) {
-			fAddContextAction.setParentObject(selectedObject);
-			fAddContextAction.setTargetObject(null);
-			fAddContextAction.setEnabled(fModel.isEditable());
-			return true;
-		} else if (fModel.getCtxHelpRoot().canAddChild(ICtxHelpConstants.TYPE_CONTEXT)) {
-			fAddContextAction.setParentObject(fModel.getCtxHelpRoot());
-			fAddContextAction.setTargetObject(null);
-			fAddContextAction.setEnabled(fModel.isEditable());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Updates the add topic action if the action should be available for the selection.
-	 * Updates enablement, parent object and target object.  Returns true if the action
-	 * should be available to the selection. 
-	 * @param selectedObject selected object
-	 * @return true if the action should be available for the current selection, false otherwise
-	 */
-	private boolean updateAddTopicActionWithSelection(CtxHelpObject selectedObject) {
-		if (selectedObject != null) {
-			if (selectedObject.canAddSibling(ICtxHelpConstants.TYPE_TOPIC)) {
-				fAddTopicAction.setParentObject(selectedObject.getParent());
-				fAddTopicAction.setTargetObject(selectedObject);
-				fAddTopicAction.setEnabled(fModel.isEditable());
-				return true;
-			} else if (selectedObject.canAddChild(ICtxHelpConstants.TYPE_TOPIC)) {
-				fAddTopicAction.setParentObject(selectedObject);
-				fAddTopicAction.setTargetObject(null);
-				fAddTopicAction.setEnabled(fModel.isEditable());
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Updates the add topic action if the action should be available for the selection.
-	 * Updates enablement, parent object and target object.  Returns true if the action
-	 * should be available to the selection. 
-	 * @param selectedObject selected object
-	 * @return true if the action should be available for the current selection, false otherwise
-	 */
-	private boolean updateAddCommandActionWithSelection(CtxHelpObject selectedObject) {
-		if (selectedObject != null) {
-			if (selectedObject.canAddSibling(ICtxHelpConstants.TYPE_COMMAND)) {
-				fAddCommandAction.setParentObject(selectedObject.getParent());
-				fAddCommandAction.setTargetObject(selectedObject);
-				fAddCommandAction.setEnabled(fModel.isEditable());
-				return true;
-			} else if (selectedObject.canAddChild(ICtxHelpConstants.TYPE_COMMAND)) {
-				fAddCommandAction.setParentObject(selectedObject);
-				fAddCommandAction.setTargetObject(null);
-				fAddCommandAction.setEnabled(fModel.isEditable());
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Updates the remove action if the action should be available for the selection.
-	 * Updates enablement, parent object and target object.  Returns true if the action
-	 * should be available to the selection. 
-	 * @param selectedObject selected object
-	 * @return true if the action should be available for the current selection, false otherwise
-	 */
-	private boolean updateRemoveActionWithSelection(IStructuredSelection selection) {
-		List objectsToRemove = getRemovableObjectFromSelection(selection);
-		fRemoveObjectAction.setToRemove((CtxHelpObject[]) objectsToRemove.toArray(new CtxHelpObject[objectsToRemove.size()]));
-		fRemoveObjectAction.setEnabled(fModel.isEditable());
-		return objectsToRemove.size() > 0;
-	}
-
-	/**
-	 * Returns a list of objects that is the subset of objects in the selection that
-	 * can be removed.
-	 * @param selection the selection
-	 * @return list of {@link CtxHelpObject}s that can be removed, possibly empty.
-	 */
-	private List getRemovableObjectFromSelection(IStructuredSelection selection) {
-		List objectsToRemove = new ArrayList();
-		for (Iterator iterator = selection.iterator(); iterator.hasNext();) {
-			Object currentObject = iterator.next();
-			if (currentObject instanceof CtxHelpObject && ((CtxHelpObject) currentObject).canBeRemoved()) {
-				objectsToRemove.add(currentObject);
-			}
-		}
-		return objectsToRemove;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		boolean cutAction = actionId.equals(ActionFactory.CUT.getId());
-
-		if (cutAction || actionId.equals(ActionFactory.DELETE.getId())) {
-			updateRemoveActionWithSelection((IStructuredSelection) fTree.getSelection());
-			fRemoveObjectAction.run();
-			return !cutAction;
-		}
-
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(java.lang.Object, java.lang.Object[])
-	 */
-	protected boolean canPaste(Object targetObject, Object[] sourceObjects) {
-		return canDropCopy(targetObject, sourceObjects, ViewerDropAdapter.LOCATION_ON);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(java.lang.Object, java.lang.Object[])
-	 */
-	protected void doPaste(Object targetObject, Object[] sourceObjects) {
-		doDropCopy(targetObject, sourceObjects, ViewerDropAdapter.LOCATION_ON);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#handleDoubleClick(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		Object selected = selection.getFirstElement();
-		if (selected instanceof CtxHelpTopic) {
-			open((CtxHelpTopic) selected);
-		} else if (selected instanceof CtxHelpObject) {
-			fTree.setExpandedState(selected, !fTree.getExpandedState(selected));
-		}
-	}
-
-	/**
-	 * Opens the file that is linked in the given topic.
-	 * @param topic the topic containing a link to a file
-	 */
-	public void open(CtxHelpTopic topic) {
-		IPath resourcePath = topic.getLocation();
-		if (!isEditable() || resourcePath == null || resourcePath.isEmpty()) {
-			MessageDialog.openWarning(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), CtxHelpMessages.CtxHelpTreeSection_18, CtxHelpMessages.CtxHelpTreeSection_19);
-			return;
-		}
-
-		IResource resource = fModel.getUnderlyingResource().getProject().findMember(resourcePath);
-		if (resource != null && resource instanceof IFile) {
-			IPath path = resource.getFullPath();
-			if (HelpEditorUtil.hasValidPageExtension(path)) {
-				try {
-					IDE.openEditor(PDEUserAssistanceUIPlugin.getActivePage(), (IFile) resource, true);
-				} catch (PartInitException e) { //suppress exception
-				}
-			} else {
-				MessageDialog.openWarning(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), CtxHelpMessages.CtxHelpTreeSection_20, CtxHelpMessages.CtxHelpTreeSection_21);
-			}
-		} else {
-			MessageDialog.openWarning(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), CtxHelpMessages.CtxHelpTreeSection_22, CtxHelpMessages.CtxHelpTreeSection_23);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#buttonSelected(int)
-	 */
-	protected void buttonSelected(int index) {
-		IStructuredSelection selection = (IStructuredSelection) fTree.getSelection();
-		Object object = selection.getFirstElement();
-		CtxHelpObject firstSelectedObject = (CtxHelpObject) object;
-		switch (index) {
-			case F_BUTTON_ADD_CONTEXT :
-				updateAddContextActionWithSelection(firstSelectedObject);
-				fAddContextAction.run();
-				break;
-			case F_BUTTON_ADD_TOPIC :
-				updateAddTopicActionWithSelection(firstSelectedObject);
-				fAddTopicAction.run();
-				break;
-			case F_BUTTON_ADD_COMMAND :
-				updateAddCommandActionWithSelection(firstSelectedObject);
-				fAddCommandAction.run();
-				break;
-			case F_BUTTON_REMOVE :
-				updateRemoveActionWithSelection(selection);
-				fRemoveObjectAction.run();
-				break;
-			case F_BUTTON_UP :
-				handleMoveAction(F_UP_FLAG);
-				break;
-			case F_BUTTON_DOWN :
-				handleMoveAction(F_DOWN_FLAG);
-				break;
-		}
-	}
-
-	/**
-	 * Move an object within the structure.
-	 * 
-	 * @param positionFlag The direction that the object will move, either F_UP_FLAG or F_DOWN_FLAG
-	 */
-	private void handleMoveAction(int positionFlag) {
-		IStructuredSelection sel = (IStructuredSelection) fTree.getSelection();
-
-		Object object = sel.getFirstElement();
-		if (object == null) {
-			return;
-		} else if (object instanceof CtxHelpObject) {
-			CtxHelpObject ctxHelpObject = (CtxHelpObject) object;
-			CtxHelpObject parent = ctxHelpObject.getParent();
-			if (parent != null) {
-				parent.moveChild(ctxHelpObject, positionFlag);
-				fTree.setSelection(new StructuredSelection(ctxHelpObject), true);
-			}
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
-	 */
-	public void refresh() {
-		CtxHelpModel model = (CtxHelpModel) getPage().getModel();
-		fTree.setInput(model);
-		fTree.expandToLevel(2);
-		fTree.setSelection(new StructuredSelection(model.getCtxHelpRoot()), true);
-		getManagedForm().fireSelectionChanged(this, fTree.getSelection());
-		super.refresh();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#isDragAndDropEnabled()
-	 */
-	protected boolean isDragAndDropEnabled() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#getSupportedDNDOperations()
-	 */
-	public int getSupportedDNDOperations() {
-		return DND.DROP_MOVE | DND.DROP_COPY;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doDropCopy(java.lang.Object, java.lang.Object[], int)
-	 */
-	public void doDropCopy(Object targetObject, Object[] sourceObjects, int targetLocation) {
-		if (fDropTargetParent != null) {
-			if (fDropTargetSibling != null) {
-				if (targetLocation == ViewerDropAdapter.LOCATION_BEFORE) {
-					for (int i = 0; i < sourceObjects.length; i++) {
-						((CtxHelpObject) sourceObjects[i]).reconnect(fDropTargetParent, fModel);
-						fDropTargetParent.addChild((CtxHelpObject) sourceObjects[i], fDropTargetSibling, true);
-					}
-				} else {
-					for (int i = sourceObjects.length - 1; i >= 0; i--) {
-						((CtxHelpObject) sourceObjects[i]).reconnect(fDropTargetParent, fModel);
-						fDropTargetParent.addChild((CtxHelpObject) sourceObjects[i], fDropTargetSibling, false);
-					}
-				}
-			} else {
-				for (int i = 0; i < sourceObjects.length; i++) {
-					((CtxHelpObject) sourceObjects[i]).reconnect(fDropTargetParent, fModel);
-					fDropTargetParent.addChild((CtxHelpObject) sourceObjects[i]);
-				}
-			}
-		}
-		fDropTargetParent = null;
-		fDropTargetSibling = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doDropMove(java.lang.Object, java.lang.Object[], int)
-	 */
-	public void doDropMove(Object targetObject, Object[] sourceObjects, int targetLocation) {
-		doDropCopy(targetObject, sourceObjects, targetLocation);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canDropCopy(java.lang.Object, java.lang.Object[], int)
-	 */
-	public boolean canDropCopy(Object targetObject, Object[] sourceObjects, int targetLocation) {
-		// Add as a child of the root
-		if (targetObject == null || !(targetObject instanceof CtxHelpObject || ((CtxHelpObject) targetObject).getType() == ICtxHelpConstants.TYPE_ROOT)) {
-			for (int i = 0; i < sourceObjects.length; i++) {
-				if (!(sourceObjects[i] instanceof CtxHelpObject) || !fModel.getCtxHelpRoot().canAddChild(((CtxHelpObject) sourceObjects[i]).getType())) {
-					return false;
-				}
-			}
-			fDropTargetParent = fModel.getCtxHelpRoot();
-			fDropTargetSibling = null;
-			return true;
-		}
-
-		CtxHelpObject dropTarget = (CtxHelpObject) targetObject;
-
-		// Add as a child of the target
-		if (targetLocation == ViewerDropAdapter.LOCATION_ON) {
-			boolean result = true;
-			for (int i = 0; i < sourceObjects.length; i++) {
-				if (!(sourceObjects[i] instanceof CtxHelpObject) || !dropTarget.canAddChild(((CtxHelpObject) sourceObjects[i]).getType())) {
-					result = false;
-					break;
-				}
-			}
-			// If adding as a child works, do so, otherwise try as a sibling
-			if (result) {
-				fDropTargetParent = dropTarget;
-				fDropTargetSibling = null;
-				return true;
-			}
-		}
-
-		// Add as a sibling of the target
-		for (int i = 0; i < sourceObjects.length; i++) {
-			if (!(sourceObjects[i] instanceof CtxHelpObject) || !dropTarget.canAddSibling(((CtxHelpObject) sourceObjects[i]).getType())) {
-				return false;
-			}
-		}
-		fDropTargetParent = dropTarget.getParent();
-		fDropTargetSibling = dropTarget;
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canDropMove(java.lang.Object, java.lang.Object[], int)
-	 */
-	public boolean canDropMove(Object targetObject, Object[] sourceObjects, int targetLocation) {
-		// Same as drop copy operation
-		return canDropCopy(targetObject, sourceObjects, targetLocation);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canDragCopy(java.lang.Object[])
-	 */
-	public boolean canDragCopy(Object[] sourceObjects) {
-		// Allow anything to be drag copied
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canDragMove(java.lang.Object[])
-	 */
-	public boolean canDragMove(Object[] sourceObjects) {
-		for (int i = 0; i < sourceObjects.length; i++) {
-			if (!(sourceObjects[i] instanceof CtxHelpObject) || !((CtxHelpObject) sourceObjects[i]).canBeRemoved()) {
-				return false;
-			}
-		}
-		fDragFromHere = true;
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doDragRemove(java.lang.Object[])
-	 */
-	public void doDragRemove(Object[] sourceObjects) {
-		updateRemoveActionWithSelection(new StructuredSelection(sourceObjects));
-		fRemoveObjectAction.run();
-		fDragFromHere = false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// No need to call super, world changed event handled here
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			handleModelEventWorldChanged(event);
-		} else if (event.getChangeType() == IModelChangedEvent.INSERT) {
-			handleModelInsertType(event);
-		} else if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-			handleModelRemoveType(event);
-		} else if ((event.getChangeType() == IModelChangedEvent.CHANGE) && (event.getChangedProperty().equals(IDocumentElementNode.F_PROPERTY_CHANGE_TYPE_SWAP))) {
-			handleModelChangeTypeSwap(event);
-		} else if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			handleModelChangeType(event);
-		}
-	}
-
-	/**
-	 * Handles the swap event
-	 * @param event the swap event
-	 */
-	private void handleModelChangeTypeSwap(IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		CtxHelpObject object = (CtxHelpObject) objects[0];
-
-		if (object != null) {
-			fTree.refresh(object);
-		}
-	}
-
-	/**
-	 * The model is stale, refresh the UI
-	 * @param event The world-change event
-	 */
-	private void handleModelEventWorldChanged(IModelChangedEvent event) {
-		markStale();
-	}
-
-	/**
-	 * Handle insertions in the model
-	 * @param event the insertion event
-	 */
-	private void handleModelInsertType(IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof CtxHelpObject) {
-				CtxHelpObject object = (CtxHelpObject) objects[i];
-				if (object.getType() != ICtxHelpConstants.TYPE_ROOT) {
-					fTree.refresh(object.getParent());
-					// Select the new object in the tree, unless it is a description node
-					if (!(object instanceof CtxHelpDescription)) {
-						fTree.setSelection(new StructuredSelection(object), true);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Handle removals in the model
-	 * @param event the removal event
-	 */
-	private void handleModelRemoveType(IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof CtxHelpObject) {
-				CtxHelpObject object = (CtxHelpObject) objects[i];
-				fTree.remove(object);
-				CtxHelpObject nextSelection = fRemoveObjectAction.getNextSelection();
-				if (nextSelection != null) {
-					fTree.refresh(object.getParent());
-					if (!fDragFromHere) {
-						fTree.setSelection(new StructuredSelection(nextSelection), true);
-					}
-					fRemoveObjectAction.clearNextSelection();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Handle an update to an object's properties
-	 * @param event the update event
-	 */
-	private void handleModelChangeType(IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		if (objects[0] != null) {
-			fTree.update(objects[0], null);
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractAddAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractAddAction.java
deleted file mode 100644
index df114fb..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractAddAction.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-
-/**
- * Abstract action that allows new nodes to be added to the context help
- * model.
- * @since 3.4
- */
-public abstract class CtxHelpAbstractAddAction extends Action {
-
-	protected CtxHelpObject fParentObject;
-
-	//The target object to insert after
-	protected CtxHelpObject fTargetObject;
-
-	/**
-	 * Set the parent object that this action will add
-	 * objects to.
-	 * 
-	 * @param parent The new parent object for this action
-	 */
-	public void setParentObject(CtxHelpObject parent) {
-		fParentObject = parent;
-	}
-
-	/**
-	 * Set the target object that this action will add
-	 * objects after.
-	 * 
-	 * @param target The new target object for this action
-	 */
-	public void setTargetObject(CtxHelpObject target) {
-		fTargetObject = target;
-	}
-
-	/**
-	 * Returns the names of the children of the parent object.  Used
-	 * to find a new name that doesn't conflict.  Will return an empty
-	 * array if the parent is not set.
-	 * @return children names or an empty array
-	 */
-	public String[] getChildNames() {
-		if (fParentObject != null) {
-			int numChildren = fParentObject.getChildren().size();
-			CtxHelpObject[] ctxHelpObjects = (CtxHelpObject[]) fParentObject.getChildren().toArray(new CtxHelpObject[numChildren]);
-
-			String[] ctxHelpObjectNames = new String[ctxHelpObjects.length];
-
-			for (int i = 0; i < numChildren; ++i) {
-				ctxHelpObjectNames[i] = ctxHelpObjects[i].getName();
-			}
-			return ctxHelpObjectNames;
-		}
-		return new String[0];
-	}
-
-	/**
-	 * Add the child to the parent object. If a target object is specified,
-	 * add the child as a sibling after that object.
-	 * 
-	 * @param child The object to add to the parent
-	 */
-	protected void addChild(CtxHelpObject child) {
-		if (fTargetObject == null) {
-			fParentObject.addChild(child);
-		} else {
-			fParentObject.addChild(child, fTargetObject, false);
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java
deleted file mode 100644
index 0992c5a..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpAbstractDetails.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.editor.PDEDetails;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-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.forms.IFormPart;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * Abstract details class that acts as the base for the details section of the context
- * help editor.  The details section will display a form specific to the current tree
- * selection, allowing the user to edit the fields.
- * @since 3.4
- */
-public abstract class CtxHelpAbstractDetails extends PDEDetails {
-
-	/**
-	 * Number of columns the detail section will have
-	 */
-	private static final int NUM_COLUMNS = 3;
-
-	private CtxHelpTreeSection fMasterSection;
-	private Section fMainSection;
-	private String fContextID;
-
-	public CtxHelpAbstractDetails(CtxHelpTreeSection masterSection, String contextID) {
-		fMasterSection = masterSection;
-		fContextID = contextID;
-		fMainSection = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		parent.setLayout(FormLayoutFactory.createDetailsGridLayout(false, 1));
-		createDetails(parent);
-		hookListeners();
-	}
-
-	/**
-	 * Create the UI elements for the detail section
-	 * @param parent parent composite to create the details in
-	 */
-	public void createDetails(Composite parent) { // Create the main section
-		int style = ExpandableComposite.TITLE_BAR;
-
-		if (getDetailsDescription() != null)
-			style |= Section.DESCRIPTION;
-
-		fMainSection = getPage().createUISection(parent, getDetailsTitle(), getDetailsDescription(), style);
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fMainSection);
-		// Create the container for the main section
-		Composite sectionClient = getPage().createUISectionContainer(fMainSection, NUM_COLUMNS);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		fMainSection.setLayoutData(data);
-		createFields(sectionClient);
-
-		// Bind widgets
-		getManagedForm().getToolkit().paintBordersFor(sectionClient);
-		fMainSection.setClient(sectionClient);
-		markDetailsPart(fMainSection);
-	}
-
-	/**
-	 * Subclasses must use this method to create the fields that allow user input.
-	 * @param parent parent composite
-	 */
-	protected abstract void createFields(Composite parent);
-
-	/**
-	 * @return the title to display at the top of the details section
-	 */
-	protected abstract String getDetailsTitle();
-
-	/**
-	 * @return the description to display at the top of the details section
-	 */
-	protected abstract String getDetailsDescription();
-
-	/**
-	 * Subclasses should add there listeners by overriding this method.
-	 */
-	public abstract void hookListeners();
-
-	/**
-	 * Subclasses should update the form entries using their CtxHelpObject.  This method
-	 * should be called from subclasses implementation of {@link #selectionChanged(IFormPart, ISelection)}
-	 */
-	public abstract void updateFields();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// NO-OP
-		// Children to override
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#fireSaveNeeded()
-	 */
-	public void fireSaveNeeded() {
-		markDirty();
-		getPage().getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#getContextId()
-	 */
-	public String getContextId() {
-		return fContextID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#getPage()
-	 */
-	public PDEFormPage getPage() {
-		return (PDEFormPage) getManagedForm().getContainer();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#isEditable()
-	 */
-	public boolean isEditable() {
-		return fMasterSection.isEditable();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// NO-OP
-	}
-
-	/**
-	 * @return whether the section is editable
-	 */
-	public boolean isEditableElement() {
-		return fMasterSection.isEditable();
-	}
-
-	/**
-	 * @return the toolkit to use to create the form elements
-	 */
-	public FormToolkit getToolkit() {
-		return getManagedForm().getToolkit();
-	}
-
-	/**
-	 * @return the tree section that controls this details section
-	 */
-	public CtxHelpTreeSection getMasterSection() {
-		return fMasterSection;
-	}
-
-	/**
-	 * Create a new label in the given composite using the appropriate style
-	 * as defined by the toolkit.
-	 * @param parent composite to create the label in
-	 * @param toolkit toolkit that will define the style of the label
-	 * @param text label text
-	 */
-	protected void createLabel(Composite parent, FormToolkit toolkit, String text) {
-		Label label = toolkit.createLabel(parent, text, SWT.WRAP);
-		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		gd.horizontalSpan = NUM_COLUMNS;
-		label.setLayoutData(gd);
-	}
-
-	/**
-	 * Creates an empty label generating empty space in the parent composite.
-	 * @param parent composite to create the space in
-	 */
-	protected void createSpace(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the first object from the selection or <code>null</code>.
-	 * @param selection selection to get the object from
-	 * @return first object in the selection or <code>null</code>
-	 */
-	protected Object getFirstSelectedObject(ISelection selection) {
-		// Get the structured selection (obtained from the master tree viewer)
-		IStructuredSelection structuredSel = ((IStructuredSelection) selection);
-		// Ensure we have a selection
-		if (structuredSel == null) {
-			return null;
-		}
-		return structuredSel.getFirstElement();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpCommandDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpCommandDetails.java
deleted file mode 100644
index dfb9f62..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpCommandDetails.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpCommand;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-
-/**
- * Details section for command entries.
- * @since 3.4
- * @see CtxHelpAbstractDetails
- * @see CtxHelpCommand
- */
-public class CtxHelpCommandDetails extends CtxHelpAbstractDetails {
-
-	private CtxHelpCommand fCommand;
-	private FormEntry fLabelEntry;
-	private FormEntry fSerialEntry;
-
-	public CtxHelpCommandDetails(CtxHelpTreeSection masterSection) {
-		super(masterSection, CtxHelpInputContext.CONTEXT_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#createFields(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpCommandDetails_labelDesc);
-		fLabelEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpCommandDetails_labelText, SWT.NONE);
-		createSpace(parent);
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpCommandDetails_commandDesc);
-		fSerialEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpCommandDetails_commandText, SWT.NONE);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsTitle()
-	 */
-	protected String getDetailsTitle() {
-		return CtxHelpDetailsMessages.CtxHelpCommandDetails_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsDescription()
-	 */
-	protected String getDetailsDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		fLabelEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fCommand != null) {
-					fCommand.setLabel(fLabelEntry.getValue());
-				}
-			}
-		});
-		fSerialEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) { // Ensure data object is defined
-				if (fCommand != null) {
-					fCommand.setSerialization(fSerialEntry.getValue());
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		if (fCommand != null) {
-			fLabelEntry.setValue(fCommand.getLabel(), true);
-			fLabelEntry.setEditable(isEditableElement());
-			fSerialEntry.setValue(fCommand.getSerialization(), true);
-			fSerialEntry.setEditable(isEditableElement());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fLabelEntry.commit();
-		fSerialEntry.commit();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		Object object = getFirstSelectedObject(selection);
-		if (object instanceof CtxHelpCommand) {
-			fCommand = (CtxHelpCommand) object;
-			updateFields();
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpContextDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpContextDetails.java
deleted file mode 100644
index b5d38dc..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpContextDetails.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpContext;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-
-/**
- * Details section for context entries.
- * @since 3.4
- * @see CtxHelpAbstractDetails
- * @see CtxHelpContext
- */
-public class CtxHelpContextDetails extends CtxHelpAbstractDetails {
-
-	private CtxHelpContext fContext;
-	private FormEntry fIdEntry;
-	private FormEntry fTitleEntry;
-	private FormEntry fDescEntry;
-
-	public CtxHelpContextDetails(CtxHelpTreeSection masterSection) {
-		super(masterSection, CtxHelpInputContext.CONTEXT_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#createFields(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpContextDetails_idDesc);
-		fIdEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpContextDetails_idLabel, SWT.NONE);
-		createSpace(parent);
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpContextDetails_descDesc);
-		fDescEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpContextDetails_descText, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.heightHint = 50;
-		fDescEntry.getText().setLayoutData(data);
-		data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_END);
-		fDescEntry.getLabel().setLayoutData(data);
-		createSpace(parent);
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpContextDetails_titleDesc);
-		fTitleEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpContextDetails_titleTitle, SWT.NONE);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsTitle()
-	 */
-	protected String getDetailsTitle() {
-		return CtxHelpDetailsMessages.CtxHelpContextDetails_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsDescription()
-	 */
-	protected String getDetailsDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		fIdEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fContext != null) {
-					fContext.setID(fIdEntry.getValue());
-				}
-			}
-		});
-		fDescEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fContext != null) {
-					if (fDescEntry.getValue().trim().length() > 0) {
-						fContext.setDescription(fDescEntry.getValue());
-					} else {
-						// Pass null to delete the description node because it is empty
-						fContext.setDescription(null);
-					}
-				}
-			}
-		});
-		fTitleEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) { // Ensure data object is defined
-				if (fContext != null) {
-					fContext.setTitle(fTitleEntry.getValue());
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		if (fContext != null) {
-			fIdEntry.setValue(fContext.getId(), true);
-			fIdEntry.setEditable(isEditableElement());
-			fDescEntry.setValue(fContext.getDescription(), true);
-			fDescEntry.setEditable(isEditableElement());
-			fTitleEntry.setValue(fContext.getTitle(), true);
-			fTitleEntry.setEditable(isEditableElement());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fIdEntry.commit();
-		fDescEntry.commit();
-		fTitleEntry.commit();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		Object object = getFirstSelectedObject(selection);
-		if (object instanceof CtxHelpContext) {
-			fContext = (CtxHelpContext) object;
-			updateFields();
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDescriptionDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDescriptionDetails.java
deleted file mode 100644
index 27ca3e7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDescriptionDetails.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpDescription;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-
-/**
- * Details section for description entries.
- * @since 3.4
- * @see CtxHelpAbstractDetails
- * @see CtxHelpDescription
- */
-public class CtxHelpDescriptionDetails extends CtxHelpAbstractDetails {
-
-	private CtxHelpDescription fDescription;
-	private FormEntry fDescEntry;
-
-	public CtxHelpDescriptionDetails(CtxHelpTreeSection masterSection) {
-		super(masterSection, CtxHelpInputContext.CONTEXT_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#createFields(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpDescriptionDetails_descDesc);
-		fDescEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpDescriptionDetails_descLabel, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.heightHint = 50;
-		fDescEntry.getText().setLayoutData(data);
-		data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_END);
-		fDescEntry.getLabel().setLayoutData(data);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsTitle()
-	 */
-	protected String getDetailsTitle() {
-		return CtxHelpDetailsMessages.CtxHelpDescriptionDetails_title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsDescription()
-	 */
-	protected String getDetailsDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		fDescEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fDescription != null) {
-					fDescription.setDescription(fDescEntry.getValue());
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		if (fDescription != null) {
-			fDescEntry.setValue(fDescription.getDescription(), true);
-			fDescEntry.setEditable(isEditableElement());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fDescEntry.commit();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		Object object = getFirstSelectedObject(selection);
-		if (object instanceof CtxHelpDescription) {
-			fDescription = (CtxHelpDescription) object;
-			updateFields();
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDetailsMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDetailsMessages.java
deleted file mode 100644
index bce3645..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpDetailsMessages.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CtxHelpDetailsMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details.messages"; //$NON-NLS-1$
-	
-	public static String CtxHelpCommandDetails_commandDesc;
-	public static String CtxHelpCommandDetails_commandText;
-	public static String CtxHelpCommandDetails_labelDesc;
-	public static String CtxHelpCommandDetails_labelText;
-	public static String CtxHelpCommandDetails_title;
-	public static String CtxHelpContextDetails_descDesc;
-	public static String CtxHelpContextDetails_descText;
-	public static String CtxHelpContextDetails_idDesc;
-	public static String CtxHelpContextDetails_idLabel;
-	public static String CtxHelpContextDetails_title;
-	public static String CtxHelpContextDetails_titleDesc;
-	public static String CtxHelpContextDetails_titleTitle;
-	public static String CtxHelpDescriptionDetails_descDesc;
-	public static String CtxHelpDescriptionDetails_descLabel;
-	public static String CtxHelpDescriptionDetails_title;
-	public static String CtxHelpRemoveAction_remove;
-	public static String CtxHelpTopicDetails_browseTitle;
-	public static String CtxHelpTopicDetails_detailsTitle;
-	public static String CtxHelpTopicDetails_dialogMessage;
-	public static String CtxHelpTopicDetails_dialogTitle;
-	public static String CtxHelpTopicDetails_label;
-	public static String CtxHelpTopicDetails_location;
-	public static String CtxHelpTopicDetails_locationHTML;
-	public static String CtxHelpTopicDetails_locationTitle;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, CtxHelpDetailsMessages.class);
-	}
-
-	private CtxHelpDetailsMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpRemoveAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpRemoveAction.java
deleted file mode 100644
index 26f22ef..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpRemoveAction.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpObject;
-
-/**
- * The action used to remove one or more elements from the context help xml.
- * @since 3.4
- */
-public class CtxHelpRemoveAction extends Action {
-
-	private CtxHelpObject[] fObjects;
-
-	//The next object to be selected after the
-	//selected object is removed
-	private CtxHelpObject fObjectToSelect;
-
-	public CtxHelpRemoveAction() {
-		// Adds the 'Delete' keybinding to the action when displayed
-		// in a context menu
-		setActionDefinitionId("org.eclipse.ui.edit.delete"); //$NON-NLS-1$
-		setText(CtxHelpDetailsMessages.CtxHelpRemoveAction_remove);
-	}
-
-	/**
-	 * Sets the objects to be removed when this action is run.
-	 * @param objects objects to remove
-	 */
-	public void setToRemove(CtxHelpObject[] objects) {
-		fObjects = objects;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fObjects == null)
-			return;
-
-		for (int i = 0; i < fObjects.length; ++i) {
-			if (fObjects[i] != null && fObjects[i].canBeRemoved()) {
-				CtxHelpObject parent = fObjects[i].getParent();
-				if (parent != null) {
-					determineNextSelection(parent, i);
-					parent.removeChild(fObjects[i]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Determine the next object that should be selected
-	 * after the designated object has been removed
-	 * 
-	 * @param parent The parent of the deleted object
-	 */
-	private void determineNextSelection(CtxHelpObject parent, int index) {
-		// Select the next sibling
-		fObjectToSelect = parent.getNextSibling(fObjects[index]);
-		if (fObjectToSelect == null) {
-			// No next sibling
-			// Select the previous sibling
-			fObjectToSelect = parent.getPreviousSibling(fObjects[index]);
-			if (fObjectToSelect == null) {
-				// No previous sibling
-				// Select the parent
-				fObjectToSelect = parent;
-			}
-		}
-	}
-
-	/**
-	 * Returns the object that should be selected after the action is run.
-	 * @return the object to select or <code>null</code>
-	 */
-	public CtxHelpObject getNextSelection() {
-		return fObjectToSelect;
-	}
-
-	/**
-	 * Clears the next selection returned by {@link #getNextSelection()}.
-	 */
-	public void clearNextSelection() {
-		fObjectToSelect = null;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpTopicDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpTopicDetails.java
deleted file mode 100644
index 6156b33..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/CtxHelpTopicDetails.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.ctxhelp.details;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpTopic;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpTreeSection;
-import org.eclipse.pde.internal.ua.ui.editor.toc.details.HelpEditorFilter;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.FileValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Details section for topic entries.
- * @since 3.4
- * @see CtxHelpAbstractDetails
- * @see CtxHelpTopic
- */
-public class CtxHelpTopicDetails extends CtxHelpAbstractDetails {
-
-	private CtxHelpTopic fTopic;
-	private FormEntry fLabelEntry;
-	private FormEntry fLinkEntry;
-
-	public CtxHelpTopicDetails(CtxHelpTreeSection masterSection) {
-		super(masterSection, CtxHelpInputContext.CONTEXT_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#createFields(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpTopicDetails_label);
-		fLabelEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpTopicDetails_location, SWT.NONE);
-		createSpace(parent);
-		createLabel(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpTopicDetails_locationHTML);
-		fLinkEntry = new FormEntry(parent, getManagedForm().getToolkit(), CtxHelpDetailsMessages.CtxHelpTopicDetails_locationTitle, CtxHelpDetailsMessages.CtxHelpTopicDetails_browseTitle, isEditable());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsTitle()
-	 */
-	protected String getDetailsTitle() {
-		return CtxHelpDetailsMessages.CtxHelpTopicDetails_detailsTitle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#getDetailsDescription()
-	 */
-	protected String getDetailsDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		fLabelEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fTopic != null) {
-					fTopic.setLabel(fLabelEntry.getValue());
-				}
-			}
-		});
-		fLinkEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) { // Ensure data object is defined
-				if (fTopic != null) {
-					// TODO Do we need better testing for path validity?
-					fTopic.setLocation(new Path(fLinkEntry.getValue()));
-				}
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse();
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				handleOpen();
-			}
-		});
-	}
-
-	/**
-	 * Handle when the browse button is pressed.  Open up a file selection dialog.
-	 */
-	private void handleBrowse() {
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getPage().getSite().getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(CtxHelpDetailsMessages.CtxHelpTopicDetails_dialogTitle);
-		dialog.setMessage(CtxHelpDetailsMessages.CtxHelpTopicDetails_dialogMessage);
-		dialog.addFilter(new HelpEditorFilter());
-
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == Window.OK) {
-			IFile file = (IFile) dialog.getFirstResult();
-			setPathEntry(file);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		if (fTopic != null) {
-			fLabelEntry.setValue(fTopic.getLabel(), true);
-			fLabelEntry.setEditable(isEditableElement());
-			if (fTopic.getLocation() == null) {
-				fLinkEntry.setValue("", true); //$NON-NLS-1$
-			} else {
-				fLinkEntry.setValue(fTopic.getLocation().toPortableString(), true);
-			}
-			fLinkEntry.setEditable(isEditableElement());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fLabelEntry.commit();
-		fLinkEntry.commit();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ctxhelp.details.CtxHelpAbstractDetails#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		Object object = getFirstSelectedObject(selection);
-		if (object instanceof CtxHelpTopic) {
-			fTopic = (CtxHelpTopic) object;
-			updateFields();
-		}
-	}
-
-	/**
-	 * Sets the text of the form entry used to supply a link
-	 * @param file
-	 */
-	protected void setPathEntry(IFile file) {
-		IPath path = file.getFullPath();
-		if (file.getProject().equals(fTopic.getModel().getUnderlyingResource().getProject())) {
-			fLinkEntry.setValue(path.removeFirstSegments(1).toString());
-		} else {
-			fLinkEntry.setValue(".." + path.toString()); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Handle when the link is pressed.  Try opening the file at the specified path.
-	 */
-	protected void handleOpen() {
-		getMasterSection().open(fTopic);
-		// TODO Consider having a wizard open to create a new file if the path does not exist
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/messages.properties
deleted file mode 100644
index e25f694..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/details/messages.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-CtxHelpCommandDetails_commandDesc=Specify the command to invoke:
-CtxHelpCommandDetails_commandText=Command:
-CtxHelpCommandDetails_labelDesc=Specify the display label for this command:
-CtxHelpCommandDetails_labelText=Label:
-CtxHelpCommandDetails_title=Command Details
-CtxHelpContextDetails_descDesc=Specify the context description that will be displayed to the user:
-CtxHelpContextDetails_descText=Description:
-CtxHelpContextDetails_idDesc=Specify the help context id:
-CtxHelpContextDetails_idLabel=ID:
-CtxHelpContextDetails_title=Context Details
-CtxHelpContextDetails_titleDesc=Override the default title by specifying one here:
-CtxHelpContextDetails_titleTitle=Title:
-CtxHelpDescriptionDetails_descDesc=Specify the context description that will be displayed to the user:
-CtxHelpDescriptionDetails_descLabel=Description:
-CtxHelpDescriptionDetails_title=Topic Details
-CtxHelpRemoveAction_remove=Remove
-CtxHelpTopicDetails_browseTitle=Browse...
-CtxHelpTopicDetails_detailsTitle=Topic Details
-CtxHelpTopicDetails_dialogMessage=Select a Help page:
-CtxHelpTopicDetails_dialogTitle=Page Selection
-CtxHelpTopicDetails_label=Specify the display label for this topic:
-CtxHelpTopicDetails_location=Label:
-CtxHelpTopicDetails_locationHTML=Specify the location of an HTML file containing content:
-CtxHelpTopicDetails_locationTitle=Location:

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/messages.properties
deleted file mode 100644
index 6dfe0e5..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/messages.properties
+++ /dev/null

@@ -1,30 +0,0 @@
-CtxHelpEditor_text=Register this context help file
-CtxHelpPage_errMsg=An error occurred while parsing the context help xml file.
-CtxHelpPage_errTitle=Failed to load context help contents
-CtxHelpPage_formText=Context Help
-CtxHelpPage_title=Definition
-CtxHelpSourcePage_name=Source
-CtxHelpTreeSection_0=&Open
-CtxHelpTreeSection_1=Add Context
-CtxHelpTreeSection_10=Context
-CtxHelpTreeSection_11=Help_Topic
-CtxHelpTreeSection_12=Topic
-CtxHelpTreeSection_13=Help_Command
-CtxHelpTreeSection_14=Command
-CtxHelpTreeSection_15=Collapse All
-CtxHelpTreeSection_16=&New
-CtxHelpTreeSection_17=Sho&w In
-CtxHelpTreeSection_18=Open File
-CtxHelpTreeSection_19=A path to an existing file must be provided.
-CtxHelpTreeSection_2=Add Topic
-CtxHelpTreeSection_20=Open File
-CtxHelpTreeSection_21=The selected file is not a valid HTML file.
-CtxHelpTreeSection_22=Open File
-CtxHelpTreeSection_23=The specified file could not be found.
-CtxHelpTreeSection_3=Add Command
-CtxHelpTreeSection_4=Remove
-CtxHelpTreeSection_5=Up
-CtxHelpTreeSection_6=Down
-CtxHelpTreeSection_7=Context Help
-CtxHelpTreeSection_8=Edit the structure of the context help file in this section.
-CtxHelpTreeSection_9=Help_Context

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/HelpEditorUtil.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/HelpEditorUtil.java
deleted file mode 100644
index bffa3b2..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/HelpEditorUtil.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Locale;
-
-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.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-
-public class HelpEditorUtil {
-	public static final String[] pageExtensions = {
-			"htm", "shtml", "html", "xhtml" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	public static final String tocExtension = "xml"; //$NON-NLS-1$
-	private static HashSet pageExtensionSet = new HashSet(pageExtensions.length);
-
-	private static void populateHashSet() {
-		for (int i = 0; i < pageExtensions.length; ++i) {
-			pageExtensionSet.add(pageExtensions[i]);
-		}
-	}
-
-	public static boolean hasValidPageExtension(IPath path) {
-		String fileExtension = path.getFileExtension();
-		if (fileExtension != null) {
-			fileExtension = fileExtension.toLowerCase(Locale.ENGLISH);
-			if (pageExtensionSet.isEmpty()) {
-				populateHashSet();
-			}
-
-			return pageExtensionSet.contains(fileExtension);
-		}
-
-		return false;
-	}
-
-	private static boolean hasValidTocExtension(IPath path) {
-		String fileExtension = path.getFileExtension();
-		return fileExtension != null && fileExtension.equals(tocExtension);
-	}
-
-	/**
-	 * @param file
-	 */
-	public static boolean isTOCFile(IPath path) {
-		if (!hasValidTocExtension(path))
-			return false;
-
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
-		IResource resource = root.findMember(path);
-		if (resource != null && resource instanceof IFile) {
-			try {
-				IFile file = (IFile) resource;
-				IContentDescription description = file.getContentDescription();
-				IContentType type = description.getContentType();
-				return type.getId().equalsIgnoreCase(
-						IConstants.TABLE_OF_CONTENTS_CONTENT_ID);
-			} catch (CoreException e) {
-				PDEUserAssistanceUIPlugin.logException(e);
-			}
-		} else {
-			File file = path.toFile();
-			IContentTypeManager manager = Platform.getContentTypeManager();
-			try {
-				InputStream stream = new FileInputStream(file);
-				IContentType type = manager.findContentTypeFor(stream, file
-						.getName());
-				return type.getId().equalsIgnoreCase(
-						IConstants.TABLE_OF_CONTENTS_CONTENT_ID);
-			} catch (IOException e) {
-				PDEUserAssistanceUIPlugin.logException(e);
-			}
-		}
-		return false;
-	}
-
-	public static boolean isCurrentResource(IPath path, IBaseModel model) {
-		if (model instanceof IModel) {
-			IPath workspacePath = ResourcesPlugin.getWorkspace().getRoot()
-					.getLocation();
-			IPath fullPath;
-
-			if (workspacePath.isPrefixOf(path)) {
-				fullPath = ((IModel) model).getUnderlyingResource()
-						.getLocation();
-			} else {
-				fullPath = ((IModel) model).getUnderlyingResource()
-						.getFullPath();
-			}
-
-			return fullPath.equals(path);
-		}
-
-		return false;
-	}
-
-	public static String getPageExtensionList() {
-		StringBuffer buf = new StringBuffer();
-
-		for (int i = 0; i < pageExtensions.length; ++i) {
-			buf.append('.');
-			buf.append(pageExtensions[i]);
-			if (i != pageExtensions.length - 1) {
-				buf.append(", "); //$NON-NLS-1$
-			}
-		}
-
-		return buf.toString();
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocBlock.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocBlock.java
deleted file mode 100755
index 93db7f1..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocBlock.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.ua.core.toc.text.Toc;
-import org.eclipse.pde.internal.ua.core.toc.text.TocAnchor;
-import org.eclipse.pde.internal.ua.core.toc.text.TocLink;
-import org.eclipse.pde.internal.ua.core.toc.text.TocTopic;
-import org.eclipse.pde.internal.ua.ui.editor.toc.details.*;
-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.forms.DetailsPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IDetailsPageProvider;
-import org.eclipse.ui.forms.IManagedForm;
-
-/**
- * 
- */
-public class TocBlock extends PDEMasterDetailsBlock implements IModelChangedListener, IDetailsPageProvider {
-
-	private TocTreeSection fMasterSection;
-
-	private TocAbstractDetails fDetails;
-
-	private TocAbstractDetails fTopicDetails;
-
-	private TocAnchorDetails fAnchorDetails;
-
-	private TocLinkDetails fLinkDetails;
-
-	/**TODO: Comment
-	 * @param page
-	 */
-	public TocBlock(PDEFormPage page) {
-		super(page);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock#createMasterSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)
-	 */
-	protected PDESection createMasterSection(IManagedForm managedForm, Composite parent) {
-		fMasterSection = new TocTreeSection(getPage(), parent);
-		return fMasterSection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.forms.DetailsPart)
-	 */
-	protected void registerPages(DetailsPart detailsPart) {
-		// Only static pages to be defined.  Do not cache pages
-		detailsPart.setPageLimit(0);
-		// Register static page:  toc
-		fDetails = new TocDetails(fMasterSection);
-		detailsPart.registerPage(TocDetails.class, fDetails);
-		// Register static page:  tocTopic
-		fTopicDetails = new TocTopicDetails(fMasterSection);
-		detailsPart.registerPage(TocTopicDetails.class, fTopicDetails);
-		// Register static page:  tocAnchor
-		fAnchorDetails = new TocAnchorDetails(fMasterSection);
-		detailsPart.registerPage(TocAnchorDetails.class, fAnchorDetails);
-		// Register static page:  tocLink
-		fLinkDetails = new TocLinkDetails(fMasterSection);
-		detailsPart.registerPage(TocLinkDetails.class, fLinkDetails);
-		// Set this class as the page provider
-		detailsPart.setPageProvider(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// Inform the master section
-		if (fMasterSection != null) {
-			fMasterSection.modelChanged(event);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPage(java.lang.Object)
-	 */
-	public IDetailsPage getPage(Object key) {
-		// No dynamic pages.  Static pages already registered
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPageProvider#getPageKey(java.lang.Object)
-	 */
-	public Object getPageKey(Object object) {
-		ISelection selection = getSelection();
-		if (!(selection instanceof IStructuredSelection) || ((IStructuredSelection) selection).size() > 1) {
-			return object.getClass();
-		}
-
-		// Get static page key
-		if (object instanceof Toc) {
-			// Static page:  toc
-			return TocDetails.class;
-		} else if (object instanceof TocTopic) {
-			// Static page:  tocTopic
-			return TocTopicDetails.class;
-		} else if (object instanceof TocAnchor) {
-			// Static page:  tocAnchor
-			return TocAnchorDetails.class;
-		} else if (object instanceof TocLink) {
-			// Static page:  tocLink
-			return TocLinkDetails.class;
-		}
-
-		// Should never reach here
-		return object.getClass();
-	}
-
-	public ISelection getSelection() {
-		if (fMasterSection != null) {
-			return fMasterSection.getSelection();
-		}
-		return StructuredSelection.EMPTY;
-	}
-
-	public TocTreeSection getMasterSection() {
-		return fMasterSection;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocContentProvider.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocContentProvider.java
deleted file mode 100755
index dac0cd4..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocContentProvider.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-
-/**
- * TocContentProvider
- */
-public class TocContentProvider extends DefaultContentProvider implements ITreeContentProvider {
-
-	/**
-	 * 
-	 */
-	public TocContentProvider() {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof TocModel) {
-			return new Object[] {((TocModel) parentElement).getToc()};
-		} else if (parentElement instanceof TocObject) {
-			List list = ((TocObject) parentElement).getChildren();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-		return new Object[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof TocObject) {
-			return ((TocObject) element).getParent();
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return (getChildren(element).length > 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java
deleted file mode 100755
index 8c1cf16..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
-import org.eclipse.swt.dnd.TextTransfer;
-
-/**
- * TocDragAdapter implements the drag behaviour for the TOC tree section.
- */
-public class TocDragAdapter implements DragSourceListener {
-	//The TOC Tree Section being dragged from
-	private TocTreeSection fSection;
-	//The dragged items
-	private ArrayList fDraggedItems;
-
-	/**
-	 * Constructs a new Drag Adapter with the specified selection
-	 * provider and TocTreeSection
-	 * 
-	 * @param provider The provider of the dragged items
-	 * @param section The section that will handle removal
-	 */
-	public TocDragAdapter(TocTreeSection section) {
-		fSection = section;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragStart(DragSourceEvent event) {
-		if (event.doit) { //The event should only be enabled if there is a selection to drag
-			event.doit = !fSection.getSelection().isEmpty();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragSetData(DragSourceEvent event) {
-		//Check if the drag is still enabled
-		if (event.doit) {
-			IStructuredSelection sel = (IStructuredSelection) fSection.getSelection();
-
-			if (TextTransfer.getInstance().isSupportedType(event.dataType)) { //If the expected data is text, then write out the selection
-				//into its XML representation
-
-				StringWriter sw = new StringWriter();
-				PrintWriter writer = new PrintWriter(sw);
-
-				//Write the XML representation of each selected object
-				for (Iterator iter = sel.iterator(); iter.hasNext();) {
-					Object obj = iter.next();
-					if (obj instanceof TocObject) {
-						((TocObject) obj).write("", writer); //$NON-NLS-1$
-					}
-				}
-
-				//Set the event's drag object to be this String
-				event.data = sw.toString();
-				//Set the array of dragged items to null,
-				//since we are dragging a String
-				fDraggedItems = null;
-			} else if (ModelDataTransfer.getInstance().isSupportedType(event.dataType)) {
-				//If we are dragging items from the model
-				fDraggedItems = getSelectedObjects(sel);
-				TocObject[] selectedObjects = (TocObject[]) fDraggedItems.toArray(new TocObject[fDraggedItems.size()]);
-				if (selectedObjects.length == 0) { //disable the drag if there are no items selected
-					event.doit = false;
-				} else { //set the event's drag object to the selection
-					event.data = selectedObjects;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param selection The selection to place in the ArrayList
-	 * @return an ArrayList containing all removable TocObjects in the selection
-	 */
-	private ArrayList getSelectedObjects(IStructuredSelection selection) {
-		ArrayList objects = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (obj instanceof TocObject && ((TocObject) obj).canBeRemoved()) { //If the object is a removable TocObject, add it
-				objects.add(obj);
-			} else { //If the object is not a removable TocObject,
-				//we don't want to permit the drag, so return an empty list
-				return new ArrayList();
-			}
-		}
-
-		return objects;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragFinished(DragSourceEvent event) {
-		if (event.detail == DND.DROP_MOVE && fDraggedItems != null) {
-			fSection.handleDrag(fDraggedItems);
-		}
-
-		fDraggedItems = null;
-	}
-
-	public ArrayList getDraggedElements() {
-		return fDraggedItems;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java
deleted file mode 100755
index 666be86..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java
+++ /dev/null

@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerDropAdapter;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Item;
-
-/**
- * TocDropAdapter - implements drop behaviour for the TOC Tree Section.
- * It extends ViewerDropAdapter for advanced feedback behaviour, but
- * mostly overrides the specified drop behaviour.
- */
-public class TocDropAdapter extends ViewerDropAdapter {
-	private TocTreeSection fSection;
-
-	/**
-	 * Constant describing the position of the cursor relative 
-	 * to the target object.  This means the mouse is positioned
-	 * slightly after the target, but not after its children if it is
-	 * expanded.
-	 * @see #getCurrentLocation()
-	 */
-	public static final int LOCATION_JUST_AFTER = 5;
-
-	public TocDropAdapter(TreeViewer tocTree, TocTreeSection section) {
-		super(tocTree);
-		fSection = section;
-	}
-
-	/**
-	 * 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;
-			}
-			if ((coordinates.y - bounds.y) < 5) {
-				return LOCATION_BEFORE;
-			}
-			if ((bounds.y + bounds.height - coordinates.y) < 5) {
-				if ((bounds.y - coordinates.y) < 5) {
-					return LOCATION_JUST_AFTER;
-				}
-				return LOCATION_AFTER;
-			}
-		}
-		return LOCATION_ON;
-	}
-
-	/* (non-Javadoc)
-	 * A new drag has entered the widget. Do file validation if necessary,
-	 * and then set the Drag and Drop mode.
-	 */
-	public void dragEnter(DropTargetEvent event) {
-		validateFileDrop(event);
-		setDNDMode(event);
-	}
-
-	/* (non-Javadoc)
-	 * Override the dragOver behaviour to directly supply event feedback
-	 * but do nothing else.
-	 */
-	public void dragOver(DropTargetEvent event) {
-		int currentLocation = determineLocation(event);
-		switch (currentLocation) {
-			case LOCATION_BEFORE :
-				event.feedback = DND.FEEDBACK_INSERT_BEFORE;
-				break;
-			case LOCATION_AFTER :
-			case LOCATION_JUST_AFTER :
-				event.feedback = DND.FEEDBACK_INSERT_AFTER;
-				break;
-			case LOCATION_ON :
-			default :
-				event.feedback = DND.FEEDBACK_SELECT;
-				break;
-		}
-
-		event.feedback |= DND.FEEDBACK_EXPAND | DND.FEEDBACK_SCROLL;
-	}
-
-	/* (non-Javadoc)
-	 * The Drag and Drop operation changed. Change the operation to a valid one
-	 * if necessary.
-	 */
-	public void dragOperationChanged(DropTargetEvent event) {
-		validateFileDrop(event);
-		setDNDMode(event);
-	}
-
-	/**
-	 * Set the Drag and Drop mode depending on the dragged items and event
-	 * details. Files can only be copied, not linked or moved.
-	 * Model data objects can have any operation occur.
-	 * 
-	 * All other objects cannot be dropped.
-	 * 
-	 * @param event The drop event to change.
-	 */
-	private void setDNDMode(DropTargetEvent event) {
-		if (FileTransfer.getInstance().isSupportedType(event.currentDataType)) { //If a file is being dragged
-			if (event.detail == DND.DROP_DEFAULT) { //If no modifier key is pressed
-				//set the operation to DROP_COPY if available
-				//DROP_NONE otherwise
-				event.detail = (event.operations & DND.DROP_COPY);
-			} else { //If a modifier key is pressed for a file and the operation isn't a copy,
-				//disallow it
-				event.detail &= DND.DROP_COPY;
-			}
-		}
-		//The only other transfer type allowed is a Model Data Transfer
-		else if (!ModelDataTransfer.getInstance().isSupportedType(event.currentDataType)) { //disallow drag if the transfer is not Model Data or Files
-			event.detail = DND.DROP_NONE;
-		}
-	}
-
-	/**
-	 * Ensure that, if files are being dropped, they have valid
-	 * file extensions for the TOC Editor (HTML pages and XML documents).
-	 * 
-	 * Invalidate the drop if this condition is not met.
-	 * 
-	 * @param event The drop event containing the transfer.
-	 */
-	private void validateFileDrop(DropTargetEvent event) {
-		if (FileTransfer.getInstance().isSupportedType(event.currentDataType)) {
-			IBaseModel model = fSection.getPage().getModel();
-			String[] fileNames = (String[]) FileTransfer.getInstance().nativeToJava(event.currentDataType);
-			for (int i = 0; i < fileNames.length; i++) {
-				IPath path = new Path(fileNames[i]);
-
-				// Make sure that the file is in the workspace
-				if (ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path) == null) {
-					event.detail = DND.DROP_NONE;
-					return;
-				}
-
-				if(!HelpEditorUtil.hasValidPageExtension(path)
-					&& !HelpEditorUtil.isTOCFile(path))
-				{	event.detail = DND.DROP_NONE;
-					return;
-				}
-
-				// Make sure that the user isn't dropping a TOC into itself
-				if(HelpEditorUtil.isCurrentResource(path, model))
-				{	event.detail = DND.DROP_NONE;
-					return;
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Override the drop behaviour in order to directly manage the drop event
-	 */
-	public void drop(DropTargetEvent event) {
-		Object target = determineTarget(event);
-		int location = determineLocation(event);
-		if (!fSection.performDrop(target, event.data, location)) {
-			event.detail = DND.DROP_NONE;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Override the behaviour of ViewerDropAdapter#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetAdapter#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragLeave(DropTargetEvent event) { //NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * Override the behaviour of ViewerDropAdapter#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetAdapter#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dropAccept(DropTargetEvent event) { //NO-OP
-	}
-
-	//These methods are never called because much of ViewerDropAdapter's
-	//behaviour is overridden, but they must be implemented.
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#performDrop(java.lang.Object)
-	 */
-	public boolean performDrop(Object data) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @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) {
-		return false;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java
deleted file mode 100755
index 74d4adf..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java
+++ /dev/null

@@ -1,503 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.*;
-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.jdt.ui.JavaUI;
-import org.eclipse.jface.action.ControlContribution;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocMarkerManager;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.wizards.toc.RegisterTocWizard;
-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.context.InputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.ui.part.ShowInContext;
-
-/**
- * Editor for table of contents xml files (for user assistance). Provides a
- * graphical way to view and edit the xml files, as well as a source viewer.
- */
-public class TocEditor extends MultiSourceEditor {
-
-	private ImageHyperlink fImageHyperlinkRegisterTOC;
-
-	public TocEditor() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getEditorID()
-	 */
-	protected String getEditorID() {
-		return IConstants.TABLE_OF_CONTENTS_EDITOR_ID;
-	}
-
-	public Object getAdapter(Class adapter) {
-		if (inUiThread() && isShowInApplicable()) {
-			if (adapter == IShowInSource.class) {
-				return getShowInSource();
-			}
-		}
-
-		if (adapter == IShowInTargetList.class) {
-			return getShowInTargetList();
-		}
-
-		return super.getAdapter(adapter);
-	}
-
-	private boolean inUiThread() {
-		// get our workbench display
-		Display display = getSite().getWorkbenchWindow().getWorkbench().getDisplay();
-
-		// return true if we're in the UI thread
-		if (display != null && !display.isDisposed()) {
-			return display.getThread() == Thread.currentThread();
-		}
-		return false;
-	}
-
-	private boolean isShowInApplicable() {
-		if (getSelection().isEmpty()) {
-			return false;
-		}
-
-		if (getSelection() instanceof IStructuredSelection) {
-			IStructuredSelection selection = (IStructuredSelection) getSelection();
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				if (!(obj instanceof TocObject))
-					return false;
-				if (((TocObject) obj).getPath() == null)
-					return false;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the <code>IShowInSource</code> for this section.
-	 * 
-	 * @return the <code>IShowInSource</code>
-	 */
-	private IShowInSource getShowInSource() {
-		return new IShowInSource() {
-			public ShowInContext getShowInContext() {
-				ArrayList resourceList = new ArrayList();
-				IStructuredSelection selection = (IStructuredSelection) getSelection();
-				IStructuredSelection resources;
-				if (selection.isEmpty()) {
-					resources = null;
-				} else {
-					IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
-					for (Iterator iter = selection.iterator(); iter.hasNext();) {
-						Object obj = iter.next();
-						if (obj instanceof TocObject && ((TocObject) obj).getPath() != null) {
-							Path resourcePath = new Path(((TocObject) obj).getPath());
-
-							if (!resourcePath.isEmpty()) {
-								TocModel model = (TocModel) getAggregateModel();
-								IResource underlyingResource = model.getUnderlyingResource();
-								if (underlyingResource != null) {
-									IProject project = underlyingResource.getProject();
-									if (project != null) {
-										IPath pluginPath = project.getFullPath();
-										IResource resource = root.findMember(pluginPath.append(resourcePath));
-										if (resource != null) {
-											resourceList.add(resource);
-										}
-									}
-								}
-							}
-						}
-					}
-
-					resources = new StructuredSelection(resourceList);
-				}
-
-				return new ShowInContext(null, resources);
-			}
-		};
-	}
-
-	/**
-	 * Returns the <code>IShowInTargetList</code> for this section.
-	 * 
-	 * @return the <code>IShowInTargetList</code>
-	 */
-	private IShowInTargetList getShowInTargetList() {
-		return new IShowInTargetList() {
-			public String[] getShowInTargetIds() {
-				return new String[] {JavaUI.ID_PACKAGES, IPageLayout.ID_RES_NAV};
-			}
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormEditor#getContextIDForSaveAs()
-	 */
-	public String getContextIDForSaveAs() {
-		return TocInputContext.CONTEXT_ID;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#addEditorPages()
-	 */
-	protected void addEditorPages() {
-		try {
-			addPage(new TocPage(this));
-		} catch (PartInitException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-		// Add source page
-		addSourcePage(TocInputContext.CONTEXT_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormEditor#createContentOutline()
-	 */
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new TocFormOutlinePage(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormEditor#createInputContextManager
-	 * ()
-	 */
-	protected InputContextManager createInputContextManager() {
-		return new TocInputContextManager(this);
-	}
-
-	/*
-	 * (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 contexts, IFileEditorInput input) {
-		contexts.putContext(input, new TocInputContext(this, input, true));
-		contexts.monitorFile(input.getFile());
-	}
-
-	/*
-	 * (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 contexts, IStorageEditorInput input) {
-		contexts.putContext(input, new TocInputContext(this, input, true));
-	}
-
-	/*
-	 * (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 contexts, FileStoreEditorInput input) {
-		try {
-			IFileStore store = EFS.getStore(input.getURI());
-			IEditorInput in = new FileStoreEditorInput(store);
-			contexts.putContext(in, new TocInputContext(this, in, true));
-		} catch (CoreException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormEditor#editorContextAdded(org
-	 * .eclipse.pde.internal.ui.editor.context.InputContext)
-	 */
-	public void editorContextAdded(InputContext context) {
-		// Add the source page
-		addSourcePage(context.getId());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java
-	 * .lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		return fInputContextManager.findContext(TocInputContext.CONTEXT_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.pde.internal.ui.editor.context.IInputContextListener#
-	 * contextRemoved(org.eclipse.pde.internal.ui.editor.context.InputContext)
-	 */
-	public void contextRemoved(InputContext context) {
-		close(false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.pde.internal.ui.editor.context.IInputContextListener#
-	 * monitoredFileAdded(org.eclipse.core.resources.IFile)
-	 */
-	public void monitoredFileAdded(IFile monitoredFile) {
-		// NO-OP
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.pde.internal.ui.editor.context.IInputContextListener#
-	 * monitoredFileRemoved(org.eclipse.core.resources.IFile)
-	 */
-	public boolean monitoredFileRemoved(IFile monitoredFile) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getSelection()
-	 */
-	public ISelection getSelection() {
-		IFormPage formPage = getActivePageInstance();
-		if ((formPage != null) && (formPage instanceof TocPage)) {
-			// Synchronizes the selection made in the master tree view with the
-			// selection in the outline view when the link with editor button
-			// is toggled on
-			return ((TocPage) formPage).getSelection();
-		}
-
-		return super.getSelection();
-	}
-
-	public boolean canCut(ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection sel = (IStructuredSelection) selection;
-			for (Iterator iter = sel.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				if (obj instanceof TocObject && ((TocObject) obj).canBeRemoved()) {
-					return canCopy(selection);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.MultiSourceEditor#createSourcePage
-	 * (org.eclipse.pde.internal.ui.editor.PDEFormEditor, java.lang.String,
-	 * java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		return new TocSourcePage(editor, title, name);
-	}
-
-	public void contributeToToolbar(IToolBarManager manager) {
-		// Add the register cheat sheet link to the form title area
-		if (getAggregateModel().isEditable())
-			manager.add(createUIControlConRegisterCS());
-	}
-
-	private ControlContribution createUIControlConRegisterCS() {
-		return new ControlContribution("Register") { //$NON-NLS-1$
-			protected Control createControl(Composite parent) {
-				// Create UI
-				createUIImageHyperlinkRegisterToc(parent);
-				// Create Listener
-				createUIListenerImageHyperlinkRegisterToc();
-				return fImageHyperlinkRegisterTOC;
-			}
-		};
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIImageHyperlinkRegisterToc(Composite parent) {
-		fImageHyperlinkRegisterTOC = new ImageHyperlink(parent, SWT.NONE);
-		fImageHyperlinkRegisterTOC.setText(TocMessages.TocEditor_link);
-		fImageHyperlinkRegisterTOC.setUnderlined(true);
-		fImageHyperlinkRegisterTOC.setForeground(getToolkit().getHyperlinkGroup().getForeground());
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenerImageHyperlinkRegisterToc() {
-		fImageHyperlinkRegisterTOC.addHyperlinkListener(new IHyperlinkListener() {
-			public void linkActivated(HyperlinkEvent e) {
-				handleLinkActivatedRegisterTOC();
-			}
-
-			public void linkEntered(HyperlinkEvent e) {
-				handleLinkEnteredRegisterTOC(e.getLabel());
-			}
-
-			public void linkExited(HyperlinkEvent e) {
-				handleLinkExitedRegisterTOC();
-			}
-		});
-	}
-
-	/**
-	 * @param message
-	 */
-	private void handleLinkEnteredRegisterTOC(String message) {
-		// Update colour
-		fImageHyperlinkRegisterTOC.setForeground(getToolkit().getHyperlinkGroup().getActiveForeground());
-		// Update IDE status line
-		getEditorSite().getActionBars().getStatusLineManager().setMessage(message);
-	}
-
-	/**
-	 *
-	 */
-	private void handleLinkExitedRegisterTOC() {
-		// Update colour
-		fImageHyperlinkRegisterTOC.setForeground(getToolkit().getHyperlinkGroup().getForeground());
-		// Update IDE status line
-		getEditorSite().getActionBars().getStatusLineManager().setMessage(null);
-	}
-
-	/**
-	 * 
-	 */
-	private void handleLinkActivatedRegisterTOC() {
-		RegisterTocWizard wizard = new RegisterTocWizard((IModel) getAggregateModel());
-		// Initialize the wizard
-		wizard.init(PlatformUI.getWorkbench(), null);
-		// Create the dialog for the wizard
-		WizardDialog dialog = new WizardDialog(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		dialog.getShell().setSize(400, 250);
-		// Check the result
-		if (dialog.open() == Window.OK) {
-			// NO-OP
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormEditor#doSave(org.eclipse.core
-	 * .runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-
-		TocModel model = (TocModel) getAggregateModel();
-		model.setMarkerRefreshNeeded(true);
-		super.doSave(monitor);
-		model.reconciled(model.getDocument()); // model recon occurs async so we can proceed to save
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#dispose()
-	 */
-	public void dispose() {
-		// editor is closing, delete the markers
-		TocMarkerManager.deleteMarkers((TocModel) getAggregateModel());
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormEditor#createInputContexts(
-	 * org.eclipse.pde.internal.ui.editor.context.InputContextManager)
-	 */
-	protected void createInputContexts(InputContextManager contextManager) {
-		super.createInputContexts(contextManager);
-
-		// model is loaded, create markers if there were errors found
-		TocMarkerManager.createMarkers((TocModel) getAggregateModel());
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditorContributor.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditorContributor.java
deleted file mode 100755
index 550a691..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditorContributor.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.pde.internal.ui.editor.PDEFormTextEditorContributor;
-
-public class TocEditorContributor extends PDEFormTextEditorContributor {
-
-	public TocEditorContributor() {
-		super("TOC Editor"); //$NON-NLS-1$
-	}
-
-	public boolean supportsHyperlinking() {
-		return true;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFileValidator.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFileValidator.java
deleted file mode 100755
index 4aac3a4..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFileValidator.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * TocFileValidator
- *
- */
-public class TocFileValidator implements ISelectionStatusValidator {
-	IBaseModel fModel;
-
-	/**
-	 * 
-	 */
-	public TocFileValidator(IBaseModel model) {
-		fModel = model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.ISelectionStatusValidator#validate(java.lang.Object[])
-	 */
-	public IStatus validate(Object[] selection) {
-
-		// Ensure something was selected
-		if (selection.length == 0) {
-			return errorStatus(""); //$NON-NLS-1$
-		}
-		// Ensure we have a file
-		if ((selection[0] instanceof IFile) == false) {
-			return errorStatus(""); //$NON-NLS-1$
-		}
-		IFile file = (IFile) selection[0];
-		// Ensure we have a TOC file
-		if (!HelpEditorUtil.isTOCFile(file.getFullPath())) {
-			return errorStatus(TocMessages.TocFileValidator_errorMessage1);
-		}
-
-		//Ensure that the TOC file selected isn't the current file
-		if (HelpEditorUtil.isCurrentResource(file.getFullPath(), fModel)) {
-			return errorStatus(TocMessages.TocFileValidator_errorMessage2);
-		}
-
-		// If we got this far, we have a valid file
-		return okStatus(""); //$NON-NLS-1$
-
-	}
-
-	private IStatus errorStatus(String message) {
-		return new Status(IStatus.ERROR, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.ERROR, message, null);
-	}
-
-	private IStatus okStatus(String message) {
-		return new Status(IStatus.OK, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.OK, message, null);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java
deleted file mode 100755
index 5a8e379..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IEditingModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ui.editor.AbstractFoldingStructureProvider;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-
-public class TocFoldingStructureProvider extends AbstractFoldingStructureProvider {
-
-	private Map fPositionToElement = new HashMap();
-
-	public TocFoldingStructureProvider(PDESourcePage editor, IEditingModel model) {
-		super(editor, model);
-	}
-
-	public void addFoldingRegions(Set currentRegions, IEditingModel model) throws BadLocationException {
-		TocObject toc = ((TocModel) model).getToc();
-		List childList = toc.getChildren();
-		IDocumentElementNode[] children = (IDocumentElementNode[]) childList.toArray(new IDocumentElementNode[childList.size()]);
-
-		addFoldingRegions(currentRegions, children, model.getDocument());
-	}
-
-	private void addFoldingRegions(Set regions, IDocumentElementNode[] nodes, IDocument document) throws BadLocationException {
-		for (int i = 0; i < nodes.length; i++) {
-			IDocumentElementNode element = nodes[i];
-			int startLine = document.getLineOfOffset(element.getOffset());
-			int endLine = document.getLineOfOffset(element.getOffset() + element.getLength());
-			if (startLine < endLine) {
-				int start = document.getLineOffset(startLine);
-				int end = document.getLineOffset(endLine) + document.getLineLength(endLine);
-				Position position = new Position(start, end - start);
-				regions.add(position);
-				fPositionToElement.put(position, element);
-			}
-			IDocumentElementNode[] children = element.getChildNodes();
-			if (children != null) {
-				addFoldingRegions(regions, children, document);
-			}
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFormOutlinePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFormOutlinePage.java
deleted file mode 100755
index 06f4e11..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFormOutlinePage.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-
-public class TocFormOutlinePage extends FormOutlinePage {
-	/**
-	 * @param editor
-	 */
-	public TocFormOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/**
-	 * TocLabelProvider
-	 *
-	 */
-	private class TocLabelProvider extends BasicLabelProvider {
-		public TocLabelProvider(ILabelProvider ilp) {
-			super(ilp);
-		}
-
-		public String getText(Object obj) {
-			if (obj instanceof TocObject) {
-				return getObjectText((TocObject) obj);
-			}
-			return super.getText(obj);
-		}
-	}
-
-	/**
-	 * @param obj
-	 * @return
-	 */
-	protected String getObjectText(TocObject obj) {
-		return PDETextHelper.translateReadText(obj.getName());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getChildren(java.lang.Object)
-	 */
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof TocPage) {
-			TocModel toc = (TocModel) fEditor.getAggregateModel();
-			if (toc != null && toc.isLoaded()) {
-				Object[] list = new Object[1];
-				list[0] = toc.getToc();
-				return list;
-			}
-		} else if (parent instanceof TocObject) {
-			List list = ((TocObject) parent).getChildren();
-			// List is never null
-			if (list.size() > 0) {
-				return list.toArray();
-			}
-		}
-
-		return super.getChildren(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#createLabelProvider()
-	 */
-	public ILabelProvider createLabelProvider() {
-		return new TocLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#getParentPageId(java.lang.Object)
-	 */
-	protected String getParentPageId(Object item) {
-		return TocPage.PAGE_ID;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHTMLTitleUtil.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHTMLTitleUtil.java
deleted file mode 100755
index 24ea8eb..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHTMLTitleUtil.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.CharBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class TocHTMLTitleUtil {
-
-	private static final String whitespace = "[ \\t\\n\\r\\f\\v]*"; //$NON-NLS-1$
-	private static final String titleTag = "[Tt][Ii][Tt][Ll][Ee]"; //$NON-NLS-1$
-
-	private static Pattern titlePattern = null;
-
-	private static void initPattern() {
-		StringBuffer buf = new StringBuffer();
-		buf.append('<');
-		buf.append(whitespace);
-		buf.append(titleTag);
-		buf.append('>');
-		buf.append("(.*?)"); //$NON-NLS-1$
-		buf.append('<');
-		buf.append(whitespace);
-		buf.append('/');
-		buf.append(whitespace);
-		buf.append(titleTag);
-		buf.append('>');
-
-		titlePattern = Pattern.compile(buf.toString());
-	}
-
-	public static String findTitle(File f) {
-		if (titlePattern == null) {
-			initPattern();
-		}
-
-		try {
-			FileChannel fc = new FileInputStream(f).getChannel();
-
-			MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
-
-			CharBuffer cb = Charset.forName("8859_1").newDecoder().decode(bb); //$NON-NLS-1$
-
-			Matcher m = titlePattern.matcher(cb);
-			String title = null;
-			if (m.find()) {
-				title = m.group(1);
-			}
-
-			return title;
-		} catch (IOException e) {
-			return null;
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java
deleted file mode 100755
index a1847dc..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ui.editor.PDEHyperlinkDetector;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.text.ResourceHyperlink;
-
-public class TocHyperlinkDetector extends PDEHyperlinkDetector {
-
-	/**
-	 * @param editor the editor in which to detect the hyperlink
-	 */
-	public TocHyperlinkDetector(PDESourcePage page) {
-		super(page);
-	}
-
-	protected IHyperlink[] detectAttributeHyperlink(IDocumentAttributeNode attr) {
-		String attrValue = attr.getAttributeValue();
-		if (attrValue.length() == 0)
-			return null;
-
-		IDocumentElementNode node = attr.getEnclosingElement();
-		if (node == null || !(node instanceof TocObject) || !((TocObject) node).getModel().isEditable()) {
-			return null;
-		}
-
-		TocObject tocObject = (TocObject) node;
-		TocModel model = tocObject.getModel();
-		IResource res = model.getUnderlyingResource();
-		IRegion linkRegion = new Region(attr.getValueOffset(), attr.getValueLength());
-
-		IHyperlink[] link = new IHyperlink[1];
-		if (tocObject.getType() == ITocConstants.TYPE_TOC) {
-			if (attr.getAttributeName().equals(ITocConstants.ATTRIBUTE_TOPIC)) {
-				link[0] = new ResourceHyperlink(linkRegion, attrValue, res);
-			}
-		} else if (tocObject.getType() == ITocConstants.TYPE_TOPIC) {
-			if (attr.getAttributeName().equals(ITocConstants.ATTRIBUTE_HREF)) {
-				link[0] = new ResourceHyperlink(linkRegion, attrValue, res);
-			}
-		} else if (tocObject.getType() == ITocConstants.TYPE_LINK) {
-			if (attr.getAttributeName().equals(ITocConstants.ATTRIBUTE_TOC)) {
-				link[0] = new ResourceHyperlink(linkRegion, attrValue, res);
-			}
-		}
-
-		if (link[0] != null) {
-			return link;
-		}
-
-		return null;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContext.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContext.java
deleted file mode 100755
index 7ecbdcc..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContext.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-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.internal.core.text.AbstractEditingModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput;
-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;
-import org.eclipse.ui.IURIEditorInput;
-
-public class TocInputContext extends XMLInputContext {
-
-	public static final String CONTEXT_ID = "toc-context"; //$NON-NLS-1$	
-
-	/**
-	 * @param editor
-	 * @param input
-	 * @param primary
-	 */
-	public TocInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		if (input instanceof IStorageEditorInput) {
-			boolean isReconciling = input instanceof IFileEditorInput;
-			IDocument document = getDocumentProvider().getDocument(input);
-
-			TocModel model = new TocModel(document, isReconciling);
-
-			if (input instanceof IFileEditorInput) {
-				IFile file = ((IFileEditorInput) input).getFile();
-				model.setUnderlyingResource(file);
-				model.setCharset(file.getCharset());
-			} else if (input instanceof IURIEditorInput) {
-				IFileStore store = EFS.getStore(((IURIEditorInput) input).getURI());
-				model.setInstallLocation(store.getParent().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;
-		}
-
-		return null;
-	}
-
-	/* (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.XMLInputContext#reorderInsertEdits(java.util.ArrayList)
-	 */
-	protected void reorderInsertEdits(ArrayList ops) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#doRevert()
-	 */
-	public void doRevert() {
-		fEditOperations.clear();
-		fOperationTable.clear();
-		fMoveOperations.clear();
-		AbstractEditingModel model = (AbstractEditingModel) getModel();
-		model.reconciled(model.getDocument());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#getPartitionName()
-	 */
-	protected String getPartitionName() {
-		return "___toc_partition"; //$NON-NLS-1$
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContextManager.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContextManager.java
deleted file mode 100755
index ab8cbea..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContextManager.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-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;
-
-/**
- * CompCSInputContextManager
- *
- */
-public class TocInputContextManager extends InputContextManager {
-
-	/**
-	 * @param editor
-	 */
-	public TocInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContextManager#getAggregateModel()
-	 */
-	public IBaseModel getAggregateModel() {
-		InputContext context = findContext(TocInputContext.CONTEXT_ID);
-		if (context == null) {
-			return null;
-		}
-		return context.getModel();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocMessages.java
deleted file mode 100644
index bb8c2a9..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocMessages.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.osgi.util.NLS;
-
-public class TocMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.toc.messages"; //$NON-NLS-1$
-	
-	public static String TocEditor_link;
-	public static String TocFileValidator_errorMessage1;
-	public static String TocFileValidator_errorMessage2;
-	public static String TocPage_errorMessage;
-	public static String TocPage_errorMessage2;
-	public static String TocPage_title;
-	public static String TocSourcePage_title;
-	public static String TocTreeSection_addAnchor;
-	public static String TocTreeSection_addLink;
-	public static String TocTreeSection_addTopic;
-	public static String TocTreeSection_collapseAll;
-	public static String TocTreeSection_down;
-	public static String TocTreeSection_errorMessage1;
-	public static String TocTreeSection_errorMessage2;
-	public static String TocTreeSection_New;
-	public static String TocTreeSection_open;
-	public static String TocTreeSection_openFile;
-	public static String TocTreeSection_openFileMessage;
-	public static String TocTreeSection_openFileMessage2;
-	public static String TocTreeSection_remove;
-	public static String TocTreeSection_sectionDesc;
-	public static String TocTreeSection_sectionText;
-	public static String TocTreeSection_showIn;
-	public static String TocTreeSection_topic;
-	public static String TocTreeSection_up;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, TocMessages.class);
-	}
-
-	private TocMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java
deleted file mode 100755
index 935b392..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.core.text.IDocumentTextNode;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
-import org.eclipse.pde.internal.ua.core.toc.text.Toc;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * TocPage
- * 
- */
-public class TocPage extends PDEFormPage implements IModelChangedListener {
-	public static final String PAGE_ID = "tocPage"; //$NON-NLS-1$
-
-	private TocBlock fBlock;
-
-	/**
-	 * @param editor
-	 */
-	public TocPage(FormEditor editor) {
-		super(editor, PAGE_ID, TocMessages.TocPage_title);
-
-		fBlock = new TocBlock(this);
-	}
-
-	/**
-	 * @return
-	 */
-	public PDEMasterDetailsBlock getBlock() {
-		return fBlock;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.
-	 * eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		ScrolledForm form = managedForm.getForm();
-		TocModel model = (TocModel) getModel();
-
-		// Ensure the model was loaded properly
-		if ((model == null) || (model.isLoaded() == false)) {
-			createErrorContent(managedForm);
-		}
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TOC_EDITOR);
-		// Create the rest of the actions in the form title area
-		super.createFormContent(managedForm);
-		// Form image
-		form.setImage(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().get(PDEUserAssistanceUIPluginImages.DESC_TOC_OBJ));
-		setFormTitle(form, model);
-		// Create the master details block
-		fBlock.createContent(managedForm);
-		// Force the selection in the masters tree section to load the
-		// proper details section
-		fBlock.getMasterSection().fireSelection();
-		// Register this page to be informed of model change events
-		model.addModelChangedListener(this);
-	}
-
-	private void createErrorContent(IManagedForm managedForm) {
-		// Add error meesage to the form
-		ScrolledForm form = managedForm.getForm();
-		form.setMessage(TocMessages.TocPage_errorMessage2, IMessageProvider.ERROR);
-	}
-
-	private void setFormTitle(ScrolledForm form, TocModel model) {
-		// Form title
-		String title = PDETextHelper.translateReadText(model.getToc().getFieldLabel());
-		if (title.length() > 0) {
-			form.setText(title);
-		} else {
-			form.setText(TocMessages.TocPage_title);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#dispose()
-	 */
-	public void dispose() {
-
-		TocModel tocModel = (TocModel) getModel();
-		if (tocModel != null) {
-			tocModel.removeModelChangedListener(this);
-		}
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde
-	 * .core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-
-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object[] objects = event.getChangedObjects();
-			TocObject object = (TocObject) objects[0];
-			if (object == null) {
-				// Ignore
-			} else if (object.getType() == ITocConstants.TYPE_TOC) {
-				String changeProperty = event.getChangedProperty();
-				if ((changeProperty != null) && changeProperty.equals(ITocConstants.ATTRIBUTE_LABEL)) {
-					// Has to be a String if the property is a title
-					// Update the form page title
-					getManagedForm().getForm().setText(PDETextHelper.translateReadText((String) event.getNewValue()));
-				}
-			}
-		} else if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			handleModelEventWorldChanged(event);
-		}
-		// Inform the block
-		fBlock.modelChanged(event);
-	}
-
-	/**
-	 * @return
-	 */
-	public ISelection getSelection() {
-		return fBlock.getSelection();
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelEventWorldChanged(IModelChangedEvent event) {
-
-		Object[] objects = event.getChangedObjects();
-
-		if (objects[0] != null && objects[0] instanceof TocObject) {
-			TocObject object = (TocObject) objects[0];
-			if (object.getType() == ITocConstants.TYPE_TOC) {
-				String newValue = ((Toc) object).getFieldLabel();
-
-				// Update page title
-				getManagedForm().getForm().setText(PDETextHelper.translateReadText(newValue));
-			}
-		}
-	}
-
-	public void setActive(boolean active) {
-		super.setActive(active);
-		if (active) {
-			TocModel model = (TocModel) getModel();
-			if ((model == null) || (model.isLoaded() == false)) {
-				createErrorContent(getManagedForm());
-			} else {
-				// Clear the error message
-				getManagedForm().getForm().setMessage("", IMessageProvider.NONE);
-			}
-
-			IFormPage page = getPDEEditor().findPage(TocInputContext.CONTEXT_ID);
-			if (page instanceof TocSourcePage && ((TocSourcePage) page).getInputContext().isInSourceMode()) {
-				ISourceViewer viewer = ((TocSourcePage) page).getViewer();
-				if (viewer == null) {
-					return;
-				}
-
-				StyledText text = viewer.getTextWidget();
-				if (text == null) {
-					return;
-				}
-
-				int offset = text.getCaretOffset();
-				if (offset < 0) {
-					return;
-				}
-
-				IDocumentRange range = ((TocSourcePage) page).getRangeElement(offset, true);
-				if (range instanceof IDocumentAttributeNode) {
-					range = ((IDocumentAttributeNode) range).getEnclosingElement();
-				} else if (range instanceof IDocumentTextNode) {
-					range = ((IDocumentTextNode) range).getEnclosingElement();
-				}
-
-				if (range instanceof TocObject) {
-					fBlock.getMasterSection().setSelection(new StructuredSelection(range));
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#getHelpResource()
-	 */
-	protected String getHelpResource() {
-		return IHelpContextIds.TOC_EDITOR;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java
deleted file mode 100755
index 91b8536..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Les Jones <lesojones@gmail.com> - Bug 214511
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.IDocumentRange;
-import org.eclipse.pde.internal.core.text.IEditingModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.editor.IFoldingStructureProvider;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.XMLSourcePage;
-
-/**
- * TocSourcePage
- */
-public class TocSourcePage extends XMLSourcePage {
-
-	/**
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public TocSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEProjectionSourcePage#isQuickOutlineEnabled()
-	 */
-	public boolean isQuickOutlineEnabled() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineComparator()
-	 */
-	public ViewerComparator createOutlineComparator() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineContentProvider()
-	 */
-	public ITreeContentProvider createOutlineContentProvider() {
-		return new TocContentProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineLabelProvider()
-	 */
-	public ILabelProvider createOutlineLabelProvider() {
-		return PDEUserAssistanceUIPlugin.getDefault().getLabelProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#setPartName(java.lang.String)
-	 */
-	protected void setPartName(String partName) {
-		super.setPartName(TocMessages.TocSourcePage_title);
-	}
-
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	public Object getAdapter(Class adapter) {
-		if (IHyperlinkDetector.class.equals(adapter))
-			return new TocHyperlinkDetector(this);
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#updateSelection(java.lang.Object)
-	 */
-	public void updateSelection(Object object) {
-		if ((object instanceof IDocumentElementNode) && !((IDocumentElementNode) object).isErrorNode()) {
-			setSelectedObject(object);
-			setHighlightRange((IDocumentElementNode) object, true);
-			setSelectedRange((IDocumentElementNode) object, false);
-		}
-	}
-
-	protected IDocumentRange findRange() {
-
-		Object selectedObject = getSelection();
-
-		if (selectedObject instanceof IDocumentElementNode)
-			return (IDocumentElementNode) selectedObject;
-
-		return null;
-	}
-
-	public IDocumentRange getRangeElement(int offset, boolean searchChildren) {
-		TocObject toc = ((TocModel) getInputContext().getModel()).getToc();
-		return findNode(toc, offset, searchChildren);
-	}
-
-	protected void synchronizeOutlinePage(int offset) {
-		IDocumentRange rangeElement = getRangeElement(offset, true);
-		updateHighlightRange(rangeElement);
-		// TODO: MP: TEO: LOW: Generalize for parent - search children = true and handle attributes
-		if (rangeElement instanceof IDocumentAttributeNode) {
-			rangeElement = ((IDocumentAttributeNode) rangeElement).getEnclosingElement();
-		}
-		updateOutlinePageSelection(rangeElement);
-	}
-
-	protected void initializeEditor() {
-		super.initializeEditor();
-		setHelpContextId(IHelpContextIds.TOC_EDITOR);
-	}
-
-	protected IFoldingStructureProvider getFoldingStructureProvider(IEditingModel model) {
-		return new TocFoldingStructureProvider(this, model);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java
deleted file mode 100755
index 79c9938..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java
+++ /dev/null

@@ -1,1213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
-import org.eclipse.pde.internal.ua.core.toc.text.*;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.toc.actions.*;
-import org.eclipse.pde.internal.ua.ui.wizards.toc.NewTocFileWizard;
-import org.eclipse.pde.internal.ua.ui.wizards.toc.TocHTMLWizard;
-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.actions.CollapseAction;
-import org.eclipse.pde.internal.ui.editor.plugin.FormFilteredTree;
-import org.eclipse.pde.internal.ui.parts.TreePart;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ContributionItemFactory;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.keys.IBindingService;
-
-/**
- * TocTreeSection - The section that displays the TOC
- * tree structure and any buttons used to manipulate it.
- * This is the main section that the user will interact
- * with the TOC through.
- */
-public class TocTreeSection extends TreeSection {
-	private TocModel fModel;
-	private TreeViewer fTocTree;
-	private FormFilteredTree fFilteredTree;
-
-	/* The indices for each button attached to the Tree Viewer.
-	 * This type of UI form does not permit direct access to each particular
-	 * button. However, using these indices, one can perform any typical SWT
-	 * operation on any button.
-	 */
-	private static final int F_BUTTON_ADD_TOPIC = 0;
-	private static final int F_BUTTON_ADD_LINK = 3;
-	private static final int F_BUTTON_ADD_ANCHOR = 4;
-	private static final int F_BUTTON_REMOVE = 5;
-	private static final int F_BUTTON_UP = 6;
-	private static final int F_BUTTON_DOWN = 7;
-	private static final int F_UP_FLAG = -1;
-	private static final int F_DOWN_FLAG = 1;
-
-	private class TocOpenLinkAction extends Action {
-		private TocObject fOpenTarget;
-
-		public TocOpenLinkAction() {
-			setText(TocMessages.TocTreeSection_open);
-		}
-
-		public void setTarget(TocObject target) {
-			fOpenTarget = target;
-		}
-
-		public void run() {
-			if (fOpenTarget != null) {
-				open(fOpenTarget);
-			}
-		}
-	}
-
-	// The action that collapses down the TOC tree
-	private CollapseAction fCollapseAction;
-
-	// The actions that will add each type of TOC object
-	private TocAddTopicAction fAddTopicAction;
-	private TocAddLinkAction fAddLinkAction;
-	private TocAddAnchorAction fAddAnchorAction;
-
-	// The object removal action
-	private TocRemoveObjectAction fRemoveObjectAction;
-
-	// The action for opening a link from the context menu
-	private TocOpenLinkAction fOpenLinkAction;
-
-	// The adapter that will listen for drag events in the tree
-	private TocDragAdapter fDragAdapter;
-
-	/* If items are dragged and dropped within this tree, then
-	 * this flag inhibits reselection on the removal (drag) action,
-	 * thus ensuring that the selected objects are the ones that were
-	 * dropped.
-	 */
-	private boolean fDragFromHere;
-
-	/**
-	 * Constructs a new TOC tree section.
-	 * 
-	 * @param formPage The page that will hold this new tree section
-	 * @param parent The parent composite in the page that will contain the section widgets
-	 */
-	public TocTreeSection(PDEFormPage formPage, Composite parent) {
-
-		/* Create a new section with a description area, and some buttons.
-		 * The null entries in the String array will become blank space 
-		 * separators between the buttons.
-		 */
-		super(formPage, parent, Section.DESCRIPTION, new String[] {TocMessages.TocTreeSection_addTopic, null, null, TocMessages.TocTreeSection_addLink, TocMessages.TocTreeSection_addAnchor, TocMessages.TocTreeSection_remove, TocMessages.TocTreeSection_up, TocMessages.TocTreeSection_down});
-
-		// Initialize all the actions
-		fAddTopicAction = new TocAddTopicAction();
-		fAddLinkAction = new TocAddLinkAction();
-		fAddAnchorAction = new TocAddAnchorAction();
-		fRemoveObjectAction = new TocRemoveObjectAction();
-		fOpenLinkAction = new TocOpenLinkAction();
-	}
-
-	/* (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) {
-		// Get the model
-		fModel = (TocModel) getPage().getModel();
-
-		// Create a container in the section
-		Composite container = createClientContainer(section, 2, toolkit);
-		// Create a TOC tree in the new container
-		createTree(container, toolkit);
-		toolkit.paintBordersFor(container);
-		section.setText(TocMessages.TocTreeSection_sectionText);
-		section.setDescription(TocMessages.TocTreeSection_sectionDesc);
-		section.setClient(container);
-
-		initializeTreeViewer();
-		createSectionToolbar(section, toolkit);
-
-		// Create the adapted listener for the filter entry field
-		fFilteredTree.createUIListenerEntryFilter(this);
-	}
-
-	/**
-	 * Adds a link (with hand cursor) for tree 'Collapse All' action,
-	 * which collapses the TOC tree down to the second level
-	 * 
-	 * @param section The section that the toolbar will belong to
-	 * @param toolkit The toolkit that will be used to make the toolbar
-	 */
-	private void createSectionToolbar(Section section, FormToolkit toolkit) {
-		ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
-		ToolBar toolbar = toolBarManager.createControl(section);
-
-		final Cursor handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
-		toolbar.setCursor(handCursor);
-		// Cursor needs to be explicitly disposed
-		toolbar.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if ((handCursor != null) && (handCursor.isDisposed() == false)) {
-					handCursor.dispose();
-				}
-			}
-		});
-
-		// Add collapse action to the tool bar
-		fCollapseAction = new CollapseAction(fTocTree, TocMessages.TocTreeSection_collapseAll, 1, fModel.getToc());
-		toolBarManager.add(fCollapseAction);
-
-		toolBarManager.update(true);
-		section.setTextClient(toolbar);
-	}
-
-	/**
-	 * Create the tree widget that will contain the TOC
-	 * 
-	 * @param container The container of the tree widget
-	 * @param toolkit The toolkit used to create the tree
-	 */
-	private void createTree(Composite container, FormToolkit toolkit) {
-		TreePart treePart = getTreePart();
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-
-		fTocTree = treePart.getTreeViewer();
-		fTocTree.setContentProvider(new TocContentProvider());
-		fTocTree.setLabelProvider(PDEUserAssistanceUIPlugin.getDefault().getLabelProvider());
-
-		PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().connect(this);
-
-		createTreeListeners();
-		initDragAndDrop();
-	}
-
-	/**
-	 * Initialize the section's drag and drop capabilities
-	 */
-	private void initDragAndDrop() {
-		int ops = DND.DROP_COPY;
-		if (isEditable()) {
-			ops |= DND.DROP_MOVE;
-		}
-
-		//Content dragged from the tree viewer can be treated as model objects (TocObjects)
-		//or as text (XML representation of the TocObjects)
-		Transfer[] dragTransfers = new Transfer[] {ModelDataTransfer.getInstance(), TextTransfer.getInstance()};
-		fDragAdapter = new TocDragAdapter(this);
-		fTocTree.addDragSupport(ops, dragTransfers, fDragAdapter);
-
-		if (isEditable()) { //Model objects and files can be dropped onto the viewer
-			//TODO: Consider allowing drops/pastes of pure XML text
-			Transfer[] dropTransfers = new Transfer[] {ModelDataTransfer.getInstance(), FileTransfer.getInstance()};
-			fTocTree.addDropSupport(ops | DND.DROP_DEFAULT, dropTransfers, new TocDropAdapter(fTocTree, this));
-		}
-	}
-
-	/**
-	 * Create the action listeners for the tree.
-	 */
-	private void createTreeListeners() {
-		// Create listener for the outline view 'link with editor' toggle button
-		fTocTree.addPostSelectionChangedListener(getPage().getPDEEditor().new PDEFormEditorChangeListener());
-	}
-
-	/**
-	 * Initialize the tree viewer widget and its buttons.
-	 */
-	private void initializeTreeViewer() {
-		if (fModel == null) {
-			return;
-		}
-
-		// Connect the tree viewer to the TOC model
-		fTocTree.setInput(fModel);
-		Toc toc = fModel.getToc();
-
-		// Nodes can always be added to the root TOC node
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_TOPIC, isEditable());
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_ANCHOR, isEditable());
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_LINK, isEditable());
-
-		// Set to false because initial node selected is the root TOC node
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, false);
-		// Set to false because initial node selected is the root TOC node
-		getTreePart().setButtonEnabled(F_BUTTON_UP, false);
-		// Set to false because initial node selected is the root TOC node
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, false);
-
-		//Initially, the root TOC element is selected
-		fTocTree.setSelection(new StructuredSelection(toc), true);
-		fTocTree.expandToLevel(2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#setFormInput(java.lang.Object)
-	 */
-	public boolean setFormInput(Object object) {
-		// This method allows the outline view to select items in the tree
-		// (Invoked by org.eclipse.ui.forms.editor.IFormPage.selectReveal(Object object))
-
-		if (object instanceof TocObject) { // Select the item in the tree
-			fTocTree.setSelection(new StructuredSelection(object), true);
-
-			// Verify that something was actually selected
-			ISelection selection = fTocTree.getSelection();
-			if (selection != null && !selection.isEmpty()) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return the selection of the tree section
-	 */
-	public ISelection getSelection() {
-		return fTocTree.getSelection();
-	}
-
-	/**
-	 * @param selection the new selection for the tree section
-	 */
-	public void setSelection(ISelection selection) {
-		fTocTree.setSelection(selection);
-	}
-
-	/**
-	 * Fire a selection change event and refresh the viewer's selection
-	 */
-	public void fireSelection() {
-		fTocTree.setSelection(fTocTree.getSelection());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-
-	/**
-	 * Update the buttons in the section based on the current selection
-	 */
-	public void updateButtons() {
-		if (!fModel.isEditable()) {
-			return;
-		}
-
-		// 'Add' actions are enabled if any object in the selection can
-		// be added to
-		boolean canAddObject = false;
-		// 'Remove' is enabled if any object in the selection is removable
-		boolean canRemove = false;
-
-		IStructuredSelection sel = (IStructuredSelection) fTocTree.getSelection();
-		//TODO: Implement multi-select move actions from the root TOC element
-
-		// 'Up' is disabled if any object in the selection can't be moved up.
-		boolean canMoveUp = sel.size() == 1;
-
-		// 'Down' is disabled if any object in the selection can't be moved down.
-		boolean canMoveDown = sel.size() == 1;
-
-		for (Iterator iter = sel.iterator(); iter.hasNext();) {
-			TocObject tocObject = (TocObject) iter.next();
-
-			if (tocObject != null) {
-				if (tocObject.canBeRemoved()) {
-					canRemove = true;
-				}
-
-				TocObject parent = tocObject.getParent();
-				if (sel.size() == 1 && (tocObject.getType() == ITocConstants.TYPE_TOC || parent.getType() == ITocConstants.TYPE_TOPIC || parent.getType() == ITocConstants.TYPE_TOC)) {
-				/* Semantic rule: 
-				 * As long as the selection is a child of a 
-				 * TOC root or a topic, or the selection itself
-				 * is a TOC root, then a new object can be added
-				 * either to the selection or to the parent
-				 */
-					canAddObject = true;
-				}
-
-				//Semantic rule:
-				//You cannot rearrange the TOC root itself
-				if (tocObject.getType() == ITocConstants.TYPE_TOC) {
-					canMoveUp = false;
-					canMoveDown = false;
-				} else {
-					if (parent != null) {
-						TocTopic topic = (TocTopic) parent;
-						if (topic.isFirstChildObject(tocObject)) {
-							canMoveUp = false;
-						}
-
-						if (topic.isLastChildObject(tocObject)) {
-							canMoveDown = false;
-						}
-					}
-				}
-			} else { // How anyone can select a null object, I don't know.
-				// However, if it happens, disable all buttons.
-				canAddObject = false;
-				canRemove = false;
-				canMoveUp = false;
-				canMoveDown = false;
-
-				break;
-			}
-		}
-
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_TOPIC, canAddObject);
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_LINK, canAddObject);
-		getTreePart().setButtonEnabled(F_BUTTON_ADD_ANCHOR, canAddObject);
-		getTreePart().setButtonEnabled(F_BUTTON_REMOVE, canRemove);
-		getTreePart().setButtonEnabled(F_BUTTON_UP, canMoveUp);
-		getTreePart().setButtonEnabled(F_BUTTON_DOWN, canMoveDown);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		// Get the current selection
-		ISelection selection = fTocTree.getSelection();
-		Object object = ((IStructuredSelection) selection).getFirstElement();
-		// Has to be null or a TOC object
-		TocObject tocObject = (TocObject) object;
-
-		if (tocObject != null) {
-			boolean emptyMenu = true;
-
-			if (tocObject.canBeParent()) { // Create the "New" sub-menu
-				MenuManager submenu = new MenuManager(TocMessages.TocTreeSection_New);
-				// Populate the "New" sub-menu
-				fillContextMenuAddActions(submenu, tocObject);
-				// Add the "New" sub-menu to the main context menu
-				manager.add(submenu);
-				emptyMenu = false;
-			}
-
-			if (tocObject.getPath() != null) {
-				fOpenLinkAction.setTarget(tocObject);
-				manager.add(fOpenLinkAction);
-				emptyMenu = false;
-			}
-
-			if (!emptyMenu) { // Add a separator to the main context menu
-				manager.add(new Separator());
-			}
-		}
-
-		// Add clipboard actions
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-		manager.add(new Separator());
-
-		if (tocObject != null) { // Add the Remove action and Show In action if an object is selected
-			fillContextMenuRemoveAction(manager, tocObject);
-			manager.add(new Separator());
-
-			fillContextMenuShowInAction(manager);
-			manager.add(new Separator());
-		}
-	}
-
-	private void fillContextMenuShowInAction(IMenuManager manager) {
-		String showInLabel = TocMessages.TocTreeSection_showIn;
-
-		// Add a label for the keybinding for Show In action, if one exists
-		IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
-		if (bindingService != null) {
-			String keyBinding = bindingService.getBestActiveBindingFormattedFor("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
-			if (keyBinding != null) {
-				showInLabel += '\t' + keyBinding;
-			}
-		}
-
-		// Add the "Show In" action and its contributions
-		IMenuManager showInMenu = new MenuManager(showInLabel);
-		showInMenu.add(ContributionItemFactory.VIEWS_SHOW_IN.create(getPage().getSite().getWorkbenchWindow()));
-
-		manager.add(showInMenu);
-	}
-
-	/**
-	 * Add the addition actions (Topic, Link, Anchor) to the specified submenu
-	 * 
-	 * @param submenu The submenu to add the addition actions to
-	 * @param tocObject The object that the additions would occur relative to
-	 */
-	private void fillContextMenuAddActions(MenuManager submenu, TocObject tocObject) {
-
-		if (tocObject != null && tocObject.canBeParent()) { // Add the 'Add Topic' action to the sub-menu
-			fAddTopicAction.setParentObject(tocObject);
-			fAddTopicAction.setEnabled(fModel.isEditable());
-			submenu.add(fAddTopicAction);
-
-			// Add the 'Add Link' action to the sub-menu
-			fAddLinkAction.setParentObject(tocObject);
-			fAddLinkAction.setEnabled(fModel.isEditable());
-			submenu.add(fAddLinkAction);
-
-			// Add the 'Add Anchor' action to the sub-menu
-			fAddAnchorAction.setParentObject(tocObject);
-			fAddAnchorAction.setEnabled(fModel.isEditable());
-			submenu.add(fAddAnchorAction);
-		}
-	}
-
-	/**
-	 * Add the remove action to the context menu.
-	 * 
-	 * @param manager The context menu to add the remove action to
-	 * @param tocObject The object that would be targetted for removal
-	 */
-	private void fillContextMenuRemoveAction(IMenuManager manager, TocObject tocObject) {
-		// Add to the main context menu
-
-		// Delete task object action
-		fRemoveObjectAction.setToRemove(tocObject);
-		manager.add(fRemoveObjectAction);
-
-		fRemoveObjectAction.setEnabled(tocObject.canBeRemoved() && fModel.isEditable());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(java.lang.Object, java.lang.Object[])
-	 */
-	protected boolean canPaste(Object targetObject, Object[] sourceObjects) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		boolean cutAction = actionId.equals(ActionFactory.CUT.getId());
-
-		if (cutAction || actionId.equals(ActionFactory.DELETE.getId())) {
-			handleDeleteAction();
-			return !cutAction;
-		}
-
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(java.lang.Object, java.lang.Object[])
-	 */
-	protected void doPaste(Object targetObject, Object[] sourceObjects) {
-		performDrop(targetObject, sourceObjects, ViewerDropAdapter.LOCATION_ON);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#handleDoubleClick(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		Object selected = selection.getFirstElement();
-		if (selected instanceof TocObject) {
-			if (((TocObject) selected).hasXMLChildren()) {
-				fTocTree.setExpandedState(selected, !fTocTree.getExpandedState(selected));
-			} else {
-				open((TocObject) selected);
-			}
-		}
-	}
-
-	/**
-	 * Opens a document with the specified path
-	 * 
-	 * @param path a path to a resource, relative to this TOC's root project
-	 */
-	private void open(TocObject obj) {
-		String path = obj.getPath();
-		Path resourcePath = path != null ? new Path(path) : null;
-		if (!isEditable() || resourcePath == null || resourcePath.isEmpty()) {
-			MessageDialog.openWarning(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), TocMessages.TocTreeSection_openFile, TocMessages.TocTreeSection_openFileMessage);
-			return;
-		}
-
-		IResource resource = findResource(resourcePath);
-		if (resource != null && resource instanceof IFile) {
-			openResource(resource, obj.getType() == ITocConstants.TYPE_LINK);
-		} else {
-			MessageDialog.openWarning(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), TocMessages.TocTreeSection_openFile, TocMessages.TocTreeSection_openFileMessage2);
-		}
-	}
-
-	public IFile openFile(String path, boolean isTOCFile) {
-		Path resourcePath = new Path(path);
-		if (isEditable()) {
-			if (!resourcePath.isEmpty()) {
-				IResource page = findResource(resourcePath);
-
-				if (page != null && page instanceof IFile) {
-					openResource(page, isTOCFile);
-					return null;
-				}
-			}
-
-			return showNewWizard(path, isTOCFile);
-		}
-
-		return null;
-	}
-
-	private IFile showNewWizard(String path, boolean tocWizard) {
-		TocHTMLWizard wizard;
-		if (tocWizard) {
-			wizard = new NewTocFileWizard();
-		} else {
-			wizard = new TocHTMLWizard();
-		}
-
-		// By default, the file will be created in the same project as the TOC
-		IResource selectedFolder = fModel.getUnderlyingResource().getProject();
-		String filename = null;
-
-		// Find the folder associated with the specified path
-		IPath initialFolder = new Path(path.trim());
-		if (!initialFolder.isEmpty()) {
-			IPath newPath = selectedFolder.getFullPath().append(initialFolder);
-
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IResource newFolder = root.findMember(newPath);
-
-			if (newFolder == null) {
-				if (!newPath.hasTrailingSeparator()) {
-					filename = newPath.lastSegment();
-				}
-			}
-
-			while (newFolder == null && !newPath.isEmpty()) {
-				newPath = newPath.removeLastSegments(1);
-				newFolder = root.findMember(newPath);
-			}
-
-			if (newFolder != null) {
-				selectedFolder = newFolder;
-			}
-		}
-
-		// Select the project in the wizard
-		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection(selectedFolder));
-
-		// Create the dialog for the wizard
-		WizardDialog dialog = new WizardDialog(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		// Get the wizard page
-		IWizardPage wizardPage;
-		wizardPage = wizard.getStartingPage();
-		if (!(wizardPage instanceof WizardNewFileCreationPage)) {
-			return null;
-		}
-
-		WizardNewFileCreationPage page = (WizardNewFileCreationPage) wizardPage;
-		if (filename != null) {
-			page.setFileName(filename);
-			// Inhibit the error message when the wizard is first opened
-			page.setErrorMessage(null);
-		}
-
-		if (dialog.open() == Window.OK) {
-			return wizard.getNewResource();
-		}
-
-		return null;
-	}
-
-	private IResource findResource(Path resourcePath) {
-		IProject pluginProject = fModel.getUnderlyingResource().getProject();
-		return pluginProject.findMember(resourcePath);
-	}
-
-	private void openResource(IResource resource, boolean tocFile) {
-		IPath path = resource.getFullPath();
-
-		if (isFileValidInContext(tocFile, path)) {
-			try {
-				IDE.openEditor(PDEUserAssistanceUIPlugin.getActivePage(), (IFile) resource, true);
-			} catch (PartInitException e) { //suppress exception
-			}
-		}
-	}
-
-	private boolean isFileValidInContext(boolean tocFile, IPath path) {
-		String message = null;
-
-		if (tocFile) {
-			if (HelpEditorUtil.isTOCFile(path)) {
-				return true;
-			}
-
-			message = TocMessages.TocTreeSection_errorMessage1;
-		} else {
-			if (HelpEditorUtil.hasValidPageExtension(path)) {
-				return true;
-			}
-
-			message = TocMessages.TocTreeSection_errorMessage2;
-		}
-
-		MessageDialog.openWarning(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell(), TocMessages.TocTreeSection_openFile, message);
-
-		return false;
-	}
-
-	/**
-	 * Perform a drop of the specified objects on the target in the widget
-	 * 
-	 * @param currentTarget The object that the drop will occur near/on
-	 * @param dropped The dropped objects
-	 * @param location The location of the drop relative to the target
-	 * 
-	 * @return true iff the drop was successful
-	 */
-	public boolean performDrop(Object currentTarget, Object dropped, int location) {
-		if (dropped instanceof Object[]) {
-			TocObject tocTarget = (TocObject) currentTarget;
-			// Determine the object that the dropped objects will be the
-			// children of
-			TocTopic targetParent = determineParent(tocTarget, location);
-
-			if (location == TocDropAdapter.LOCATION_JUST_AFTER && targetParent == tocTarget && !tocTarget.getChildren().isEmpty() && fTocTree.getExpandedState(tocTarget)) { // If the drop occurs just after a parentable object
-				// and it is expanded, then insert the dropped items
-				// as the first children of the parent
-				location = ViewerDropAdapter.LOCATION_BEFORE;
-				tocTarget = (TocObject) tocTarget.getChildren().get(0);
-			}
-
-			if (targetParent != null) { // Get the TocObject versions of the dropped objects
-				ArrayList objectsToAdd = getObjectsToAdd((Object[]) dropped, targetParent);
-
-				if (objectsToAdd != null && !objectsToAdd.isEmpty()) {
-					if (fDragAdapter.getDraggedElements() != null && fDragAdapter.getDraggedElements().size() == 1 && currentTarget == fDragAdapter.getDraggedElements().get(0)) { // Last-minute check: ignore drops of an object onto/near itself
-						// to avoid unnecessarily dirtying the page
-						return false;
-					}
-
-					boolean insertBefore = (location == ViewerDropAdapter.LOCATION_BEFORE);
-
-					// Add the objects
-					handleMultiAddAction(objectsToAdd, tocTarget, insertBefore, targetParent);
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Determine the parent object that a drop will occur under,
-	 * based on the relative location of the drop and the ability
-	 * of the target to be a parent
-	 * 
-	 * @param dropTarget The target that the drop occurs near/on
-	 * @param dropLocation The location of the drop relative to the target
-	 * @return parent
-	 */
-	private TocTopic determineParent(TocObject dropTarget, int dropLocation) {
-		//We must determine what object will be the parent of the
-		//dropped objects. This is done by looking at the drop location
-		//and drop target type
-
-		if (dropTarget == null || dropTarget.getType() == ITocConstants.TYPE_TOC) { //Since the TOC root has no parent, it must be the target parent
-			return fModel.getToc();
-		} else if (!dropTarget.canBeParent()) { //If the object is a leaf, it cannot be the parent
-			//of the new objects,
-			//so the target parent must be its parent
-			return (TocTopic) dropTarget.getParent();
-		} else { //In all other cases, it depends on the location of the drop
-			//relative to the drop target
-			switch (dropLocation) {
-				case TocDropAdapter.LOCATION_JUST_AFTER : { //if the drop occurred after an expanded node
-					//and all of its children,
-					//make the drop target's parent the target parent object
-					if (!fTocTree.getExpandedState(dropTarget)) {
-						return (TocTopic) dropTarget.getParent();
-					}
-					//otherwise, the target parent is the drop target,
-					//since the drop occurred between it and its first child
-				}
-				case ViewerDropAdapter.LOCATION_ON : { //the drop location is directly on the drop target
-					//set the parent object to be the drop target
-					return (TocTopic) dropTarget;
-				}
-				case ViewerDropAdapter.LOCATION_BEFORE :
-				case ViewerDropAdapter.LOCATION_AFTER : { //if the drop is before or after the drop target,
-					//make the drop target's parent the target parent object
-					return (TocTopic) dropTarget.getParent();
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the TocObject representations of a group of dropped objects.
-	 * 
-	 * @param droppings The objects that are dropped; can be file path Strings or
-	 * deserialized TocObjects
-	 * 
-	 * @param targetParent The designated parent of the dropped objects
-	 * 
-	 * @return a list of the (reconnected) TocObject representations of the dropped objects
-	 */
-	private ArrayList getObjectsToAdd(Object[] droppings, TocTopic targetParent) {
-		ArrayList tocObjects = new ArrayList(droppings.length);
-
-		if (fDragAdapter.getDraggedElements() != null) { // If there are items in the drag adapter, then the current drag must be from
-			// this section
-			fDragFromHere = fDragAdapter.getDraggedElements().size() == droppings.length;
-		}
-
-		for (int i = 0; i < droppings.length; ++i) {
-			if (droppings[i] instanceof String) {
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
-				// If the array contains Strings, we treat them as file paths
-				Path path = new Path((String) droppings[i]);
-				IFile file = root.getFileForLocation(path);
-				if (file == null) {
-					continue;
-				}
-
-				// If the path is to a valid TOC file
-				// and it isn't the file in this model
-				// then make a link
-				if (HelpEditorUtil.isTOCFile(path) && !HelpEditorUtil.isCurrentResource(path, fModel)) {
-					tocObjects.add(makeNewTocLink(targetParent, file));
-				}
-				// If the path is to a file with an HTML page extension, make a topic
-				else if (HelpEditorUtil.hasValidPageExtension(path)) {
-					TocTopic topic = makeNewTocTopic(targetParent, file);
-					String title = generateTitle(targetParent, path);
-
-					topic.setFieldLabel(title);
-					tocObjects.add(topic);
-				}
-			} else if (droppings[i] instanceof TocObject) {
-				ArrayList dragged = fDragAdapter.getDraggedElements();
-				if (fDragFromHere) {
-					TocObject draggedObj = (TocObject) dragged.get(i);
-
-					//Nesting an object inside itself or its children
-					//is so stupid and ridiculous that I get a headache
-					//just thinking about it. Thus, this drag is not going to complete.
-					if (targetParent.descendsFrom(draggedObj)) {
-						return null;
-					}
-				}
-
-				//Reconnect this TocObject, since it was deserialized
-				((TocObject) droppings[i]).reconnect(targetParent, fModel);
-				tocObjects.add(droppings[i]);
-			}
-		}
-
-		return tocObjects;
-	}
-
-	/**
-	 * Generate the title of a Topic created via dragging in an HTML page.
-	 * Use the title of the HTML page, or generate a name based on the target
-	 * parent if no title exists.
-	 * 
-	 * @param targetParent The designated parent of this topic
-	 * @param path The path to the HTML file
-	 * 
-	 * @return The generated name of the Topic.
-	 */
-	private String generateTitle(TocTopic targetParent, Path path) {
-		String title = TocHTMLTitleUtil.findTitle(path.toFile());
-		if (title == null) {
-			int numChildren = targetParent.getChildren().size();
-			TocObject[] children = (TocObject[]) targetParent.getChildren().toArray(new TocObject[numChildren]);
-
-			String[] tocObjectNames = new String[children.length];
-
-			for (int j = 0; j < numChildren; ++j) {
-				tocObjectNames[j] = children[j].getName();
-			}
-
-			title = PDELabelUtility.generateName(tocObjectNames, TocMessages.TocTreeSection_topic);
-		}
-		return title;
-	}
-
-	/**
-	 * Create a new Topic node using the model's factory.
-	 *  
-	 * @param parent The designated parent for the new topic
-	 * @param path The file that this Topic will link to
-	 * 
-	 * @return the newly created topic
-	 */
-	private TocTopic makeNewTocTopic(TocObject parent, IFile file) {
-		return fModel.getFactory().createTocTopic(file);
-	}
-
-	/**
-	 * Create a new Link node using the model's factory.
-	 *  
-	 * @param parent The designated parent for the new link
-	 * @param path The file that this link will be associated with
-	 * 
-	 * @return the newly created link
-	 */
-	private TocLink makeNewTocLink(TocObject parent, IFile file) {
-		return fModel.getFactory().createTocLink(file);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#buttonSelected(int)
-	 */
-	protected void buttonSelected(int index) {
-		switch (index) {
-			case F_BUTTON_ADD_TOPIC :
-				handleAddAction(fAddTopicAction);
-				break;
-			case F_BUTTON_ADD_LINK :
-				handleAddAction(fAddLinkAction);
-				break;
-			case F_BUTTON_ADD_ANCHOR :
-				handleAddAction(fAddAnchorAction);
-				break;
-			case F_BUTTON_REMOVE :
-				handleDeleteAction();
-				break;
-			case F_BUTTON_UP :
-				handleMoveAction(F_UP_FLAG);
-				break;
-			case F_BUTTON_DOWN :
-				handleMoveAction(F_DOWN_FLAG);
-				break;
-		}
-	}
-
-	/**
-	 * Handle the addition of an object by preparing and running the
-	 * specified action.
-	 * 
-	 * @param action The action to run for the addition
-	 */
-	private void handleAddAction(TocAddObjectAction action) {
-		//Currently, all additions in the TOC editor are semantically similar
-		//Thus, all addition operations can follow the same procedure
-
-		ISelection sel = fTocTree.getSelection();
-		Object object = ((IStructuredSelection) sel).getFirstElement();
-		if (object == null) {
-			return;
-		}
-
-		TocObject tocObject = (TocObject) object;
-
-		if (tocObject.canBeParent()) {
-			// If the selected object can be a parent, then add
-			// the new object as a child of this object
-			action.setParentObject(tocObject);
-			action.run();
-		} else { // If the selected object cannot be a parent, then add
-			// the new object as a direct sibling of this object
-			action.setParentObject(tocObject.getParent());
-			action.setTargetObject(tocObject);
-			action.run();
-		}
-	}
-
-	/**
-	 * Handle the addition of multiple initialized objects to the TOC.
-	 * 
-	 * @param objectsToAdd The objects to be added
-	 * @param tocTarget The target to add these objects relative to
-	 * @param insertBefore Whether or not the insertion occurs before the target
-	 * @param targetParent The parent object of the newly added objects
-	 */
-	private void handleMultiAddAction(List objectsToAdd, TocObject tocTarget, boolean insertBefore, TocObject targetParent) {
-		TocObject[] tocObjects = (TocObject[]) objectsToAdd.toArray(new TocObject[objectsToAdd.size()]);
-		if (tocObjects == null)
-			return;
-
-		for (int i = 0; i < tocObjects.length; ++i) {
-			if (tocObjects[i] != null) {
-				if (targetParent != null && targetParent.canBeParent()) {
-					if (tocTarget != null && tocTarget != targetParent) { // Add the object as a direct sibling of the target
-						((TocTopic) targetParent).addChild(tocObjects[i], tocTarget, insertBefore);
-					} else { // Add the object as the last child of the target parent
-						((TocTopic) targetParent).addChild(tocObjects[i]);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Remove the selected objects from the TOC tree
-	 */
-	private void handleDeleteAction() {
-		ArrayList objects = new ArrayList(((IStructuredSelection) fTocTree.getSelection()).toList());
-		boolean beep = false;
-
-		// Iterate through the list of selected objects, removing ones
-		// that cannot be removed
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-			Object object = i.next();
-			if (object instanceof TocObject) {
-				TocObject tocObject = (TocObject) object;
-
-				if (!tocObject.canBeRemoved()) {
-					i.remove();
-					beep = true;
-				}
-			}
-		}
-
-		if (beep) { // If any object cannot be removed, beep to notify the user			
-			Display.getCurrent().beep();
-		}
-
-		// Remove the remaining objects
-		handleRemove(objects);
-	}
-
-	/**
-	 * Remove the items listed from the TOC.
-	 * 
-	 * @param itemsToRemove The list of items to remove from the TOC 
-	 */
-	public void handleRemove(List itemsToRemove) {
-		if (!itemsToRemove.isEmpty()) { // Target the objects for removal
-			fRemoveObjectAction.setToRemove((TocObject[]) itemsToRemove.toArray(new TocObject[itemsToRemove.size()]));
-
-			// Run the removal action
-			fRemoveObjectAction.run();
-		}
-	}
-
-	/**
-	 * Handle the dragging of objects out of this TOC.
-	 * 
-	 * @param itemsDragged The items dragged out of the TOC
-	 */
-	public void handleDrag(List itemsDragged) {
-		handleRemove(itemsDragged);
-
-		// The drag is finished, so there is no intra-editor DND operation occuring now
-		fDragFromHere = false;
-	}
-
-	/**
-	 * Move an object within the TOC.
-	 * 
-	 * @param positionFlag The direction that the object will move
-	 */
-	private void handleMoveAction(int positionFlag) {
-		IStructuredSelection sel = (IStructuredSelection) fTocTree.getSelection();
-
-		for (Iterator iter = sel.iterator(); iter.hasNext();) {
-			Object object = iter.next();
-			if (object == null) {
-				return;
-			} else if (object instanceof TocObject) {
-				TocObject tocObject = (TocObject) object;
-				TocTopic parent = (TocTopic) tocObject.getParent();
-
-				// Determine the parent type
-				if (parent != null) { // Move the object up or down one position
-					parent.moveChild(tocObject, positionFlag);
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// No need to call super, world changed event handled here
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			handleModelEventWorldChanged(event);
-		} else if (event.getChangeType() == IModelChangedEvent.INSERT) {
-			handleModelInsertType(event);
-		} else if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-			handleModelRemoveType(event);
-		} else if ((event.getChangeType() == IModelChangedEvent.CHANGE) && (event.getChangedProperty().equals(IDocumentElementNode.F_PROPERTY_CHANGE_TYPE_SWAP))) {
-			handleModelChangeTypeSwap(event);
-		} else if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			handleModelChangeType(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleModelChangeTypeSwap(IModelChangedEvent event) {
-		// Swap event
-		// Get the changed object
-		Object[] objects = event.getChangedObjects();
-		TocObject object = (TocObject) objects[0];
-
-		if (object != null) { // Update the element in the tree viewer
-			fTocTree.refresh(object);
-		}
-	}
-
-	/**
-	 * The model is stale, refresh the UI
-	 * 
-	 * @param event The world-change event
-	 */
-	private void handleModelEventWorldChanged(IModelChangedEvent event) {
-		markStale();
-	}
-
-	/**
-	 * Handle insertions in the model
-	 * @param event the insertion event
-	 */
-	private void handleModelInsertType(IModelChangedEvent event) {
-		// Insert event
-		Object[] objects = event.getChangedObjects();
-		TocObject object = (TocObject) objects[0];
-		if (object != null) {
-			if (object.getType() != ITocConstants.TYPE_TOC) {
-				// Refresh the parent element in the tree viewer
-				// TODO: Can we get away with an update instead of a refresh here?
-				fTocTree.refresh(object.getParent());
-				// Select the new object in the tree
-				fTocTree.setSelection(new StructuredSelection(object), true);
-			}
-		}
-	}
-
-	/**
-	 * Handle removals in the model
-	 * 
-	 * @param event the removal event
-	 */
-	private void handleModelRemoveType(IModelChangedEvent event) {
-		// Remove event
-		Object[] objects = event.getChangedObjects();
-		TocObject object = (TocObject) objects[0];
-		if (object != null) {
-			if (object.getType() != ITocConstants.TYPE_TOC) {
-				handleTaskObjectRemove(object);
-			}
-		}
-	}
-
-	/**
-	 * An object was removed, update the UI to respond to the removal
-	 * 
-	 * @param object The object that was removed
-	 */
-	private void handleTaskObjectRemove(TocObject object) {
-		// Remove the item
-		fTocTree.remove(object);
-
-		// Select the appropriate object
-		TocObject tocObject = fRemoveObjectAction.getNextSelection();
-		if (tocObject == null) {
-			tocObject = object.getParent();
-		}
-
-		if (tocObject.equals(object.getParent())) {
-			fTocTree.refresh(object.getParent());
-		}
-
-		if (!fDragFromHere) {
-			fTocTree.setSelection(new StructuredSelection(tocObject), true);
-		}
-	}
-
-	/**
-	 * Handle an update to a TocObject's properties
-	 * @param event the update event
-	 */
-	private void handleModelChangeType(IModelChangedEvent event) {
-		// Get the changed object
-		Object[] objects = event.getChangedObjects();
-		TocObject object = (TocObject) objects[0];
-
-		if (object != null) { // Update the element in the tree viewer
-			fTocTree.update(object, null);
-		}
-	}
-
-	public void refresh() {
-		TocModel model = (TocModel) getPage().getModel();
-		fTocTree.setInput(model);
-		fTocTree.expandToLevel(2);
-		fTocTree.setSelection(new StructuredSelection(model.getToc()), true);
-		getManagedForm().fireSelectionChanged(this, fTocTree.getSelection());
-		super.refresh();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TreeSection#createTreeViewer(org.eclipse.swt.widgets.Composite, int)
-	 */
-	protected TreeViewer createTreeViewer(Composite parent, int style) {
-		fFilteredTree = new FormFilteredTree(parent, style, new PatternFilter());
-		parent.setData("filtered", Boolean.TRUE); //$NON-NLS-1$
-		return fFilteredTree.getViewer();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		PDEUserAssistanceUIPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocActionMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocActionMessages.java
deleted file mode 100644
index 4342be3..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocActionMessages.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public class TocActionMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.toc.actions.messages"; //$NON-NLS-1$
-	
-	public static String TocAddAnchorAction_anchor;
-	public static String TocAddLinkAction_link;
-	public static String TocAddTopicAction_topic;
-	public static String TocRemoveObjectAction_remove;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, TocActionMessages.class);
-	}
-
-	private TocActionMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddAnchorAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddAnchorAction.java
deleted file mode 100755
index 02e7f61..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddAnchorAction.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.actions;
-
-import org.eclipse.pde.internal.ua.core.toc.text.TocAnchor;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-
-/**
- * TocAddAnchorAction - implements the addition of an Anchor object
- * to a parent TOC object.
- */
-public class TocAddAnchorAction extends TocAddObjectAction {
-
-	public TocAddAnchorAction() {
-		setText(TocActionMessages.TocAddAnchorAction_anchor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fParentObject != null) { //Create a new anchor
-			TocAnchor anchor = fParentObject.getModel().getFactory().createTocAnchor();
-			//Generate the name of the anchor
-			String name = PDELabelUtility.generateName(getChildNames(), TocActionMessages.TocAddAnchorAction_anchor);
-			anchor.setFieldAnchorId(name);
-			//Add the new anchor to the parent TOC object
-			addChild(anchor);
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddLinkAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddLinkAction.java
deleted file mode 100755
index 871d876..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddLinkAction.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.actions;
-
-import org.eclipse.pde.internal.ua.core.toc.text.TocLink;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-
-public class TocAddLinkAction extends TocAddObjectAction {
-	public TocAddLinkAction() {
-		setText(TocActionMessages.TocAddLinkAction_link);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fParentObject != null) { //Create a new link
-			TocLink link = fParentObject.getModel().getFactory().createTocLink();
-
-			//Generate the name of the link
-			String name = PDELabelUtility.generateName(getChildNames(), TocActionMessages.TocAddLinkAction_link);
-			link.setFieldTocPath(name);
-			//Add the new link to the parent TOC object
-			addChild(link);
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddObjectAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddObjectAction.java
deleted file mode 100755
index acb8238..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddObjectAction.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.core.toc.text.TocTopic;
-
-/**
- * TocAddObjectAction - the abstract implementation for
- * adding objects to a TOC object.
- */
-public abstract class TocAddObjectAction extends Action {
-	//The parent TOC object, which the new object will be
-	//a child of.
-	TocObject fParentObject;
-
-	//The target object to insert after
-	TocObject fTargetObject;
-
-	/**
-	 * Set the parent object that this action will add
-	 * objects to.
-	 * 
-	 * @param parent The new parent object for this action
-	 */
-	public void setParentObject(TocObject parent) {
-		fParentObject = parent;
-	}
-
-	/**
-	 * Set the target object that this action will add
-	 * objects after.
-	 * 
-	 * @param target The new target object for this action
-	 */
-	public void setTargetObject(TocObject target) {
-		fTargetObject = target;
-	}
-
-	/**
-	 * @return The names of the children of this TOC object
-	 */
-	public String[] getChildNames() {
-		int numChildren = fParentObject.getChildren().size();
-		TocObject[] tocObjects = (TocObject[]) fParentObject.getChildren().toArray(new TocObject[numChildren]);
-
-		String[] tocObjectNames = new String[tocObjects.length];
-
-		for (int i = 0; i < numChildren; ++i) {
-			tocObjectNames[i] = tocObjects[i].getName();
-		}
-
-		return tocObjectNames;
-	}
-
-	/**
-	 * Add the child to the parent object. If a target object is specified,
-	 * add the child as a direct sibling after that object.
-	 * 
-	 * @param child The object to add to the parent
-	 */
-	protected void addChild(TocObject child) {
-		if (fTargetObject == null) {
-			((TocTopic) fParentObject).addChild(child);
-		} else {
-			((TocTopic) fParentObject).addChild(child, fTargetObject, false);
-			fTargetObject = null;
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddTopicAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddTopicAction.java
deleted file mode 100755
index 1fb4cd1..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddTopicAction.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.actions;
-
-import org.eclipse.pde.internal.ua.core.toc.text.TocTopic;
-import org.eclipse.pde.internal.ui.util.PDELabelUtility;
-
-public class TocAddTopicAction extends TocAddObjectAction {
-
-	public TocAddTopicAction() {
-		setText(TocActionMessages.TocAddTopicAction_topic);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fParentObject != null) { //Create a new topic object
-			TocTopic topic = fParentObject.getModel().getFactory().createTocTopic();
-
-			//Generate the name for the topic
-			String name = PDELabelUtility.generateName(getChildNames(), TocActionMessages.TocAddTopicAction_topic);
-			topic.setFieldLabel(name);
-
-			//Add the new topic to the parent TOC object
-			addChild(topic);
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java
deleted file mode 100755
index a8650d5..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.core.toc.text.TocTopic;
-
-public class TocRemoveObjectAction extends Action {
-
-	//The object designated for removal
-	private TocObject[] fTocObjects;
-
-	//The next object to be selected after the
-	//selected object is removed
-	private TocObject fObjectToSelect;
-
-	public TocRemoveObjectAction() {
-		// Adds the 'Delete' keybinding to the action when displayed
-		// in a context menu
-		setActionDefinitionId("org.eclipse.ui.edit.delete"); //$NON-NLS-1$
-
-		setText(TocActionMessages.TocRemoveObjectAction_remove);
-		fTocObjects = null;
-		fObjectToSelect = null;
-	}
-
-	/**
-	 * @param tocObjects the objects to remove
-	 */
-	public void setToRemove(TocObject[] tocObjects) {
-		fTocObjects = tocObjects;
-	}
-
-	/**
-	 * @param tocObject the object to remove
-	 */
-	public void setToRemove(TocObject tocObject) {
-		fTocObjects = new TocObject[] {tocObject};
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fTocObjects == null)
-			return;
-
-		for (int i = 0; i < fTocObjects.length; ++i) {
-			if (fTocObjects[i] != null && fTocObjects[i].canBeRemoved()) {
-				TocObject parent = fTocObjects[i].getParent();
-				if (parent != null && parent.canBeParent()) {
-					// Determine the object to select after the deletion 
-					// takes place 
-					determineNextSelection(parent, i);
-					// Remove the TOC object
-					((TocTopic) parent).removeChild(fTocObjects[i]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Determine the next object that should be selected
-	 * after the designated object has been removed
-	 * 
-	 * @param parent The parent of the deleted object
-	 */
-	private void determineNextSelection(TocObject parent, int index) {
-		// Select the next sibling
-		fObjectToSelect = parent.getNextSibling(fTocObjects[index]);
-		if (fObjectToSelect == null) {
-			// No next sibling
-			// Select the previous sibling
-			fObjectToSelect = parent.getPreviousSibling(fTocObjects[index]);
-			if (fObjectToSelect == null) {
-				// No previous sibling
-				// Select the parent
-				fObjectToSelect = parent;
-			}
-		}
-	}
-
-	/**
-	 * @return the object that should be selected
-	 * after the current one is removed
-	 */
-	public TocObject getNextSelection() {
-		return fObjectToSelect;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/messages.properties
deleted file mode 100644
index b57630f..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/messages.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-TocAddAnchorAction_anchor=Anchor
-TocAddLinkAction_link=Link
-TocAddTopicAction_topic=Topic
-TocRemoveObjectAction_remove=Remove

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/HelpEditorFilter.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/HelpEditorFilter.java
deleted file mode 100644
index 217b910..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/HelpEditorFilter.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.details;
-
-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.ua.ui.editor.toc.HelpEditorUtil;
-
-public class HelpEditorFilter extends ViewerFilter {
-	public boolean select(Viewer viewer, Object parent, Object element) {
-		if (element instanceof IFile) {
-			IPath path = ((IFile) element).getFullPath();
-
-			return HelpEditorUtil.hasValidPageExtension(path);
-		}
-
-		if (element instanceof IProject && !((IProject) element).isOpen()) {
-			return false;
-		}
-
-		if (element instanceof IContainer) {
-			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/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java
deleted file mode 100755
index 8d49d9b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java
+++ /dev/null

@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.details;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
-import org.eclipse.pde.internal.ui.editor.PDEDetails;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-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.forms.IFormPart;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * TocAbstractDetails
- */
-public abstract class TocAbstractDetails extends PDEDetails {
-
-	private static final int NUM_COLUMNS = 3;
-
-	private TocTreeSection fMasterSection;
-
-	private Section fMainSection;
-
-	private String fContextID;
-
-	/**
-	 * 
-	 */
-	public TocAbstractDetails(TocTreeSection masterSection, String contextID) {
-		fMasterSection = masterSection;
-		fContextID = contextID;
-		fMainSection = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		configureParentLayout(parent);
-		createDetails(parent);
-		hookListeners();
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void configureParentLayout(Composite parent) {
-		parent.setLayout(FormLayoutFactory.createDetailsGridLayout(false, 1));
-	}
-
-	/**
-	 * @param parent
-	 */
-	public void createDetails(Composite parent) { // Create the main section
-		int style = ExpandableComposite.TITLE_BAR;
-
-		if (getDetailsDescription() != null)
-			style |= Section.DESCRIPTION;
-
-		fMainSection = getPage().createUISection(parent, getDetailsTitle(), getDetailsDescription(), style);
-		// Align the master and details section headers (misalignment caused
-		// by section toolbar icons)
-		getPage().alignSectionHeaders(getMasterSection().getSection(), fMainSection);
-		// Create the container for the main section
-		Composite sectionClient = getPage().createUISectionContainer(fMainSection, NUM_COLUMNS);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		fMainSection.setLayoutData(data);
-		createFields(sectionClient);
-
-		// Bind widgets
-		getManagedForm().getToolkit().paintBordersFor(sectionClient);
-		fMainSection.setClient(sectionClient);
-		markDetailsPart(fMainSection);
-	}
-
-	/**
-	 * 
-	 */
-	protected abstract void createFields(Composite parent);
-
-	/**
-	 * 
-	 */
-	protected abstract String getDetailsTitle();
-
-	/**
-	 * 
-	 */
-	protected abstract String getDetailsDescription();
-
-	/**
-	 * 
-	 */
-	public abstract void updateFields();
-
-	/**
-	 * 
-	 */
-	public abstract void hookListeners();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// NO-OP
-		// Children to override
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#fireSaveNeeded()
-	 */
-	public void fireSaveNeeded() {
-		markDirty();
-		getPage().getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#getContextId()
-	 */
-	public String getContextId() {
-		return fContextID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#getPage()
-	 */
-	public PDEFormPage getPage() {
-		return (PDEFormPage) getManagedForm().getContainer();
-	}
-
-	protected void setPathEntry(IFile file) {
-		IPath path = file.getFullPath();
-		if (file.getProject().equals(getDataObject().getModel().getUnderlyingResource().getProject())) {
-			getPathEntryField().setValue(path.removeFirstSegments(1).toString()); //$NON-NLS-1$
-		} else {
-			getPathEntryField().setValue(".." + path.toString()); //$NON-NLS-1$
-		}
-	}
-
-	protected void handleOpen() {
-		IFile file = getMasterSection().openFile(getPathEntryField().getValue(), isTocPath());
-		if (file != null) {
-			setPathEntry(file);
-		}
-	}
-
-	protected boolean isTocPath() {
-		return false;
-	}
-
-	protected abstract TocObject getDataObject();
-
-	protected abstract FormEntry getPathEntryField();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.IContextPart#isEditable()
-	 */
-	public boolean isEditable() {
-		return fMasterSection.isEditable();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		// NO-OP
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isEditableElement() {
-		return fMasterSection.isEditable();
-	}
-
-	/**
-	 * @return
-	 */
-	public FormToolkit getToolkit() {
-		return getManagedForm().getToolkit();
-	}
-
-	/**
-	 * @return
-	 */
-	public TocTreeSection getMasterSection() {
-		return fMasterSection;
-	}
-
-	/**
-	 * @param selection
-	 * @return
-	 */
-	protected Object getFirstSelectedObject(ISelection selection) {
-		// Get the structured selection (obtained from the master tree viewer)
-		IStructuredSelection structuredSel = ((IStructuredSelection) selection);
-		// Ensure we have a selection
-		if (structuredSel == null) {
-			return null;
-		}
-		return structuredSel.getFirstElement();
-	}
-
-	protected void createLabel(Composite client, FormToolkit toolkit, String text) {
-		Label label = toolkit.createLabel(client, text, SWT.WRAP);
-		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		gd.horizontalSpan = NUM_COLUMNS;
-		label.setLayoutData(gd);
-	}
-
-	protected void createSpace(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), ""); //$NON-NLS-1$
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAnchorDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAnchorDetails.java
deleted file mode 100755
index 5a3d69c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAnchorDetails.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.details;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ua.core.toc.text.TocAnchor;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-
-public class TocAnchorDetails extends TocAbstractDetails {
-
-	private TocAnchor fDataTOCAnchor;
-
-	private FormEntry fAnchorIdEntry;
-
-	/**
-	 * @param masterSection
-	 */
-	public TocAnchorDetails(TocTreeSection masterSection) {
-		super(masterSection, TocInputContext.CONTEXT_ID);
-		fDataTOCAnchor = null;
-
-		fAnchorIdEntry = null;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(TocAnchor object) {
-		// Set data
-		fDataTOCAnchor = object;
-	}
-
-	protected TocObject getDataObject() {
-		return fDataTOCAnchor;
-	}
-
-	protected FormEntry getPathEntryField() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createAnchorIdWidget(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createAnchorIdWidget(Composite parent) {
-		fAnchorIdEntry = new FormEntry(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocAnchorDetails_idText, SWT.NONE);
-		// Ensure that the text field has proper width
-		fAnchorIdEntry.getText().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-	}
-
-	protected String getDetailsTitle() {
-		return TocDetailsMessages.TocAnchorDetails_title;
-	}
-
-	protected String getDetailsDescription() {
-		return TocDetailsMessages.TocAnchorDetails_idDesc;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		createAnchorIdEntryListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createAnchorIdEntryListeners() {
-		fAnchorIdEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTOCAnchor != null) {
-					{
-						fDataTOCAnchor.setFieldAnchorId(fAnchorIdEntry.getValue());
-					}
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataTOCAnchor != null) { // Update name entry
-			updateAnchorIdEntry(isEditableElement());
-		}
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateAnchorIdEntry(boolean editable) {
-		fAnchorIdEntry.setValue(fDataTOCAnchor.getFieldAnchorId(), true);
-		fAnchorIdEntry.setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fAnchorIdEntry.commit();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if (object != null && object instanceof TocAnchor) {
-			// Set data
-			setData((TocAnchor) object);
-			// Update the UI given the new data
-			updateFields();
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetails.java
deleted file mode 100755
index 3323c3f..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetails.java
+++ /dev/null

@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.details;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.ua.core.toc.text.Toc;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.FileValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class TocDetails extends TocAbstractDetails {
-
-	private Toc fDataTOC;
-
-	private FormEntry fNameEntry;
-	private FormEntry fAnchorEntry;
-	private FormEntry fPageEntry;
-
-	/**
-	 * @param masterSection
-	 */
-	public TocDetails(TocTreeSection masterSection) {
-		super(masterSection, TocInputContext.CONTEXT_ID);
-		fDataTOC = null;
-
-		fNameEntry = null;
-		fAnchorEntry = null;
-		fPageEntry = null;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(Toc object) {
-		// Set data
-		fDataTOC = object;
-	}
-
-	protected TocObject getDataObject() {
-		return fDataTOC;
-	}
-
-	protected FormEntry getPathEntryField() {
-		return fPageEntry;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createNameWidget(parent);
-		createSpace(parent);
-		createAnchorWidget(parent);
-		createSpace(parent);
-		createPageWidget(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createNameWidget(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocDetails_nameDesc);
-
-		fNameEntry = new FormEntry(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocDetails_nameText, SWT.NONE);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createAnchorWidget(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocDetails_anchorDesc);
-
-		fAnchorEntry = new FormEntry(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocDetails_anchorText, SWT.NONE);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createPageWidget(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocDetails_locationDesc);
-
-		fPageEntry = new FormEntry(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocDetails_locationText, TocDetailsMessages.TocDetails_browse, isEditable());
-	}
-
-	protected String getDetailsTitle() {
-		return TocDetailsMessages.TocDetails_title;
-	}
-
-	protected String getDetailsDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		createNameEntryListeners();
-		createAnchorEntryListeners();
-		createPageEntryListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createNameEntryListeners() {
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTOC != null) {
-					{
-						fDataTOC.setFieldLabel(fNameEntry.getValue());
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createAnchorEntryListeners() {
-		fAnchorEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTOC != null) {
-					{
-						fDataTOC.setFieldAnchorTo(fAnchorEntry.getValue());
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createPageEntryListeners() {
-		fPageEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) { // Ensure data object is defined
-				if (fDataTOC != null) {
-					fDataTOC.setFieldRef(fPageEntry.getValue());
-				}
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse();
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				handleOpen();
-			}
-		});
-	}
-
-	private void handleBrowse() {
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getPage().getSite().getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(TocDetailsMessages.TocDetails_dialogTitle);
-		dialog.setMessage(TocDetailsMessages.TocDetails_dialogMessage);
-		dialog.addFilter(new HelpEditorFilter());
-
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == Window.OK) {
-			IFile file = (IFile) dialog.getFirstResult();
-			setPathEntry(file);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataTOC != null) { // Update name entry
-			updateNameEntry(isEditableElement());
-			updateAnchorEntry(isEditableElement());
-			updatePageEntry(isEditableElement());
-		}
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateNameEntry(boolean editable) {
-		fNameEntry.setValue(fDataTOC.getFieldLabel(), true);
-		fNameEntry.setEditable(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateAnchorEntry(boolean editable) {
-		fAnchorEntry.setValue(fDataTOC.getFieldAnchorTo(), true);
-		fAnchorEntry.setEditable(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updatePageEntry(boolean editable) {
-		fPageEntry.setValue(fDataTOC.getFieldRef(), true);
-		fPageEntry.setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fNameEntry.commit();
-		fAnchorEntry.commit();
-		fPageEntry.commit();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if (object != null && object instanceof Toc) {
-			// Set data
-			setData((Toc) object);
-			// Update the UI given the new data
-			updateFields();
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetailsMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetailsMessages.java
deleted file mode 100644
index 24709e0..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetailsMessages.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc.details;
-
-import org.eclipse.osgi.util.NLS;
-
-public class TocDetailsMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.editor.toc.details.messages"; //$NON-NLS-1$
-	
-	public static String TocAnchorDetails_idDesc;
-	public static String TocAnchorDetails_idText;
-	public static String TocAnchorDetails_title;
-	public static String TocDetails_anchorDesc;
-	public static String TocDetails_anchorText;
-	public static String TocDetails_browse;
-	public static String TocDetails_dialogMessage;
-	public static String TocDetails_dialogTitle;
-	public static String TocDetails_locationDesc;
-	public static String TocDetails_locationText;
-	public static String TocDetails_nameDesc;
-	public static String TocDetails_nameText;
-	public static String TocDetails_title;
-	public static String TocLinkDetails_browse;
-	public static String TocLinkDetails_dialogMessage;
-	public static String TocLinkDetails_dialogTitle;
-	public static String TocLinkDetails_locationDesc;
-	public static String TocLinkDetails_locationText;
-	public static String TocLinkDetails_title;
-	public static String TocTopicDetails_browse;
-	public static String TocTopicDetails_dialogMessage;
-	public static String TocTopicDetails_dialogTitle;
-	public static String TocTopicDetails_locationDesc;
-	public static String TocTopicDetails_locationText;
-	public static String TocTopicDetails_nameDesc;
-	public static String TocTopicDetails_nameText;
-	public static String TocTopicDetails_title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, TocDetailsMessages.class);
-	}
-
-	private TocDetailsMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocLinkDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocLinkDetails.java
deleted file mode 100755
index 382cd69..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocLinkDetails.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.editor.toc.details;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.ua.core.toc.text.TocLink;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.ui.editor.toc.HelpEditorUtil;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocFileValidator;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.FileExtensionFilter;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class TocLinkDetails extends TocAbstractDetails {
-
-	private TocLink fDataTOCLink;
-
-	private FormEntry fTocPathEntry;
-
-	/**
-	 * @param masterSection
-	 */
-	public TocLinkDetails(TocTreeSection masterSection) {
-		super(masterSection, TocInputContext.CONTEXT_ID);
-		fDataTOCLink = null;
-
-		fTocPathEntry = null;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(TocLink object) {
-		// Set data
-		fDataTOCLink = object;
-	}
-
-	protected TocObject getDataObject() {
-		return fDataTOCLink;
-	}
-
-	protected FormEntry getPathEntryField() {
-		return fTocPathEntry;
-	}
-
-	protected boolean isTocPath() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.cheatsheet.CSAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createTocPathWidget(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createTocPathWidget(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocLinkDetails_locationDesc);
-
-		fTocPathEntry = new FormEntry(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocLinkDetails_locationText, TocDetailsMessages.TocLinkDetails_browse, isEditable());
-	}
-
-	protected String getDetailsTitle() {
-		return TocDetailsMessages.TocLinkDetails_title;
-	}
-
-	protected String getDetailsDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.toc.TocAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		createTocPathEntryListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createTocPathEntryListeners() {
-		fTocPathEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTOCLink != null) {
-					fDataTOCLink.setFieldTocPath(fTocPathEntry.getValue());
-				}
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse();
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				handleOpen();
-			}
-		});
-	}
-
-	private void handleBrowse() {
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getPage().getSite().getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
-		dialog.setValidator(new TocFileValidator(fDataTOCLink.getModel()));
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(TocDetailsMessages.TocLinkDetails_dialogTitle);
-		dialog.setMessage(TocDetailsMessages.TocLinkDetails_dialogMessage);
-		dialog.addFilter(new FileExtensionFilter(HelpEditorUtil.tocExtension));
-
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == Window.OK) {
-			IFile file = (IFile) dialog.getFirstResult();
-			setPathEntry(file);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.toc.TocAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataTOCLink != null) { // Update name entry
-			updateTocPathEntry(isEditableElement());
-		}
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateTocPathEntry(boolean editable) {
-		fTocPathEntry.setValue(fDataTOCLink.getFieldTocPath(), true);
-		fTocPathEntry.setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fTocPathEntry.commit();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if (object != null && object instanceof TocLink) {
-			// Set data
-			setData((TocLink) object);
-			// Update the UI given the new data
-			updateFields();
-		}
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocTopicDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocTopicDetails.java
deleted file mode 100755
index cbdb283..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocTopicDetails.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.editor.toc.details;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.ua.core.toc.text.TocObject;
-import org.eclipse.pde.internal.ua.core.toc.text.TocTopic;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocInputContext;
-import org.eclipse.pde.internal.ua.ui.editor.toc.TocTreeSection;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.FileValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class TocTopicDetails extends TocAbstractDetails {
-
-	private TocTopic fDataTOCTopic;
-
-	private FormEntry fNameEntry;
-	private FormEntry fPageEntry;
-
-	/**
-	 * @param masterSection
-	 */
-	public TocTopicDetails(TocTreeSection masterSection) {
-		super(masterSection, TocInputContext.CONTEXT_ID);
-		fDataTOCTopic = null;
-
-		fNameEntry = null;
-		fPageEntry = null;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setData(TocTopic object) {
-		// Set data
-		fDataTOCTopic = object;
-	}
-
-	protected TocObject getDataObject() {
-		return fDataTOCTopic;
-	}
-
-	protected FormEntry getPathEntryField() {
-		return fPageEntry;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.toc.TocAbstractDetails#createDetails(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createFields(Composite parent) {
-		createNameWidget(parent);
-		createSpace(parent);
-		createPageWidget(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createNameWidget(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocTopicDetails_nameDesc);
-
-		fNameEntry = new FormEntry(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocTopicDetails_nameText, SWT.NONE);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createPageWidget(Composite parent) {
-		createLabel(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocTopicDetails_locationDesc);
-
-		fPageEntry = new FormEntry(parent, getManagedForm().getToolkit(), TocDetailsMessages.TocTopicDetails_locationText, TocDetailsMessages.TocTopicDetails_browse, isEditable());
-	}
-
-	protected String getDetailsTitle() {
-		return TocDetailsMessages.TocTopicDetails_title;
-	}
-
-	protected String getDetailsDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.toc.TocAbstractDetails#hookListeners()
-	 */
-	public void hookListeners() {
-		createNameEntryListeners();
-		createPageEntryListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void createNameEntryListeners() {
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				// Ensure data object is defined
-				if (fDataTOCTopic != null) {
-					{
-						fDataTOCTopic.setFieldLabel(fNameEntry.getValue());
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createPageEntryListeners() {
-		fPageEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) { // Ensure data object is defined
-				if (fDataTOCTopic != null) {
-					fDataTOCTopic.setFieldRef(fPageEntry.getValue());
-				}
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse();
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				handleOpen();
-			}
-		});
-	}
-
-	private void handleBrowse() {
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getPage().getSite().getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(TocDetailsMessages.TocTopicDetails_dialogTitle);  
-		dialog.setMessage(TocDetailsMessages.TocTopicDetails_dialogMessage);  
-		dialog.addFilter(new HelpEditorFilter());
-		
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == Window.OK) {
-			IFile file = (IFile) dialog.getFirstResult();
-			setPathEntry(file);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.toc.TocAbstractDetails#updateFields()
-	 */
-	public void updateFields() {
-		// Ensure data object is defined
-		if (fDataTOCTopic != null) { // Update name entry
-			updateNameEntry(isEditableElement());
-			updatePageEntry(isEditableElement());
-		}
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updateNameEntry(boolean editable) {
-		fNameEntry.setValue(fDataTOCTopic.getFieldLabel(), true);
-		fNameEntry.setEditable(editable);
-	}
-
-	/**
-	 * @param editable
-	 */
-	private void updatePageEntry(boolean editable) {
-		fPageEntry.setValue(fDataTOCTopic.getFieldRef(), true);
-		fPageEntry.setEditable(editable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-		// Only required for form entries
-		fNameEntry.commit();
-		fPageEntry.commit();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		// Get the first selected object
-		Object object = getFirstSelectedObject(selection);
-		// Ensure we have the right type
-		if (object != null && object instanceof TocTopic) {
-			// Set data
-			setData((TocTopic) object);
-			// Update the UI given the new data
-			updateFields();
-		}
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/messages.properties
deleted file mode 100644
index 124ba5c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/messages.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-TocAnchorDetails_idDesc=Specify an anchor ID to provide a point where other tables of contents can embed their contents:
-TocAnchorDetails_idText=Anchor ID:*
-TocAnchorDetails_title=Anchor Details
-TocDetails_anchorDesc=Specify an anchor to embed this table of contents into another table of contents:
-TocDetails_anchorText=Anchor:
-TocDetails_browse=Browse...
-TocDetails_dialogMessage=Select a Help page:
-TocDetails_dialogTitle=Page Selection
-TocDetails_locationDesc=Specify the location of an HTML file to provide content:
-TocDetails_locationText=Location:
-TocDetails_nameDesc=Specify the display name of this table of contents:
-TocDetails_nameText=Name:*
-TocDetails_title=Book Details
-TocLinkDetails_browse=Browse...
-TocLinkDetails_dialogMessage=Select a table of contents:
-TocLinkDetails_dialogTitle=Table of Contents Selection
-TocLinkDetails_locationDesc=Specify the location of a table of contents to include in this table of contents:
-TocLinkDetails_locationText=Location:*
-TocLinkDetails_title=Link Details
-TocTopicDetails_browse=Browse...
-TocTopicDetails_dialogMessage=Select a Help page:
-TocTopicDetails_dialogTitle=Page Selection
-TocTopicDetails_locationDesc=Specify the location of an HTML file to provide content:
-TocTopicDetails_locationText=Location:
-TocTopicDetails_nameDesc=Specify the display name of this topic:
-TocTopicDetails_nameText=Name:*
-TocTopicDetails_title=Topic Details

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/messages.properties
deleted file mode 100644
index b19527d..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/messages.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-TocEditor_link=Register this table of contents
-TocFileValidator_errorMessage1=The selected file is not a table of contents
-TocFileValidator_errorMessage2=Tables of contents cannot be nested within themselves
-TocPage_errorMessage=Failed to load table of contents
-TocPage_errorMessage2=An error was encountered while parsing the table of contents' XML file.
-TocPage_title=Definition
-TocSourcePage_title=Source
-TocTreeSection_addAnchor=Add Anchor
-TocTreeSection_addLink=Add Link
-TocTreeSection_addTopic=Add Topic
-TocTreeSection_collapseAll=Collapse All
-TocTreeSection_down=Down
-TocTreeSection_errorMessage1=The selected file is not a valid table of contents.
-TocTreeSection_errorMessage2=The selected file is not a valid HTML file.
-TocTreeSection_New=&New
-TocTreeSection_open=&Open
-TocTreeSection_openFile=Open File
-TocTreeSection_openFileMessage=A path to an existing file must be provided.
-TocTreeSection_openFileMessage2=The specified file could not be found.
-TocTreeSection_remove=Remove
-TocTreeSection_sectionDesc=Edit the structure of this table of contents in the following section.
-TocTreeSection_sectionText=Table of Contents
-TocTreeSection_showIn=Sho&w In
-TocTreeSection_topic=Topic
-TocTreeSection_up=Up

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/BaseCSCreationOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/BaseCSCreationOperation.java
deleted file mode 100755
index 8123a3a..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/BaseCSCreationOperation.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-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.ISetSelectionTarget;
-
-/**
- * BaseCheatSheetCreationOperation
- */
-public abstract class BaseCSCreationOperation extends WorkspaceModifyOperation {
-
-	protected IFile fFile;
-
-	/**
-	 * 
-	 */
-	public BaseCSCreationOperation(IFile file) {
-		fFile = file;
-	}
-
-	/**
-	 * @param rule
-	 */
-	public BaseCSCreationOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	/* (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(CSWizardMessages.BaseCSCreationOperation_task, 2);
-		createContent();
-		monitor.worked(1);
-		openFile();
-		monitor.done();
-	}
-
-	/**
-	 * 
-	 */
-	protected abstract void createContent() throws CoreException;
-
-	/**
-	 * 
-	 */
-	private void openFile() {
-		Display.getCurrent().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchWindow window = PDEUserAssistanceUIPlugin.getActiveWorkbenchWindow();
-				if (window == null) {
-					return;
-				}
-				IWorkbenchPage page = window.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 {
-					IDE.openEditor(page, fFile);
-				} catch (PartInitException e) {
-					// Ignore
-				}
-			}
-		});
-	}
-
-	/**
-	 * @param text
-	 * @return
-	 */
-	public static String formatTextBold(String text) {
-		// TODO: MP: CompCS:  Create generalized HTML formatter utility
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<b>"); //$NON-NLS-1$
-		buffer.append(text);
-		buffer.append("</b>"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java
deleted file mode 100755
index 5d5d316..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import java.util.HashMap;
-
-/**
- * CSCategoryTrackerUtil
- * Bi-directional hash map utility
- */
-public class CSCategoryTrackerUtil {
-
-	public final static int F_TYPE_NO_CATEGORY = 0;
-
-	public final static int F_TYPE_NEW_CATEGORY = 1;
-
-	public final static int F_TYPE_OLD_CATEGORY = 2;
-
-	private HashMap fCategoryNameMap;
-
-	private HashMap fCategoryIDMap;
-
-	private HashMap fCategoryTypeMap;
-
-	/**
-	 * 
-	 */
-	public CSCategoryTrackerUtil() {
-
-		// Look-up hashmap
-		// Keys are category ids
-		// Values are category names		
-		fCategoryIDMap = new HashMap();
-
-		// Reverse look-up hashmap
-		// Keys are category names
-		// Values are category ids
-		fCategoryNameMap = new HashMap();
-
-		// Look-up hashmap
-		// Keys are category ids
-		// Values are category types: either new or old
-		fCategoryTypeMap = new HashMap();
-
-	}
-
-	/**
-	 * @param id
-	 * @param name
-	 */
-	public void associate(String id, String name, int type) {
-		fCategoryNameMap.put(name, id);
-		fCategoryIDMap.put(id, name);
-		fCategoryTypeMap.put(id, new Integer(type));
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	public boolean containsCategoryName(String name) {
-		return fCategoryNameMap.containsKey(name);
-	}
-
-	/**
-	 * @param id
-	 * @return
-	 */
-	public boolean containsCategoryID(String id) {
-		return fCategoryIDMap.containsKey(id);
-	}
-
-	/**
-	 * @param id
-	 * @return
-	 */
-	public String getCategoryName(String id) {
-		return (String) fCategoryIDMap.get(id);
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	public String getCategoryID(String name) {
-		return (String) fCategoryNameMap.get(name);
-	}
-
-	/**
-	 * @param id
-	 * @return
-	 */
-	public int getCategoryType(String id) {
-		Integer integer = (Integer) fCategoryTypeMap.get(id);
-		if (integer == null) {
-			return F_TYPE_NO_CATEGORY;
-		}
-		return integer.intValue();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSFileWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSFileWizardPage.java
deleted file mode 100755
index 940f537..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSFileWizardPage.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;
-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.ui.PlatformUI;
-
-/**
- * CheatSheetFileWizardPage
- *
- */
-public class CSFileWizardPage extends PDEWizardNewFileCreationPage {
-
-	private Button fSimpleCheatSheetButton;
-
-	private Button fCompositeCheatSheetButton;
-
-	private Group fGroup;
-
-	protected static final String F_FILE_EXTENSION = "xml"; //$NON-NLS-1$
-
-	public static final int F_SIMPLE_CHEAT_SHEET = 0;
-
-	public static final int F_COMPOSITE_CHEAT_SHEET = 1;
-
-	/**
-	 * @param pageName
-	 * @param selection
-	 */
-	public CSFileWizardPage(String pageName, IStructuredSelection selection) {
-		super(pageName, selection);
-
-		initialize();
-	}
-
-	/**
-	 * 
-	 */
-	protected void initialize() {
-		setTitle(CSWizardMessages.CSFileWizardPage_title);
-		setDescription(CSWizardMessages.CSFileWizardPage_description);
-		// Force the file extension to be 'xml'
-		setFileExtension(F_FILE_EXTENSION);
-	}
-
-	/**
-	 * @return
-	 */
-	public int getCheatSheetType() {
-		if (fSimpleCheatSheetButton.getSelection()) {
-			return F_SIMPLE_CHEAT_SHEET;
-		} else if (fCompositeCheatSheetButton.getSelection()) {
-			return F_COMPOSITE_CHEAT_SHEET;
-		}
-		// Neither selected. Unknown type
-		return -1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createAdvancedControls(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createAdvancedControls(Composite parent) {
-
-		GridData data = null;
-
-		// Cheat Sheet Group
-		fGroup = new Group(parent, SWT.NONE);
-		fGroup.setText(CSWizardMessages.CSFileWizardPage_group);
-		fGroup.setLayout(new GridLayout(1, false));
-		fGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// Simple Cheat Sheet Button
-		fSimpleCheatSheetButton = new Button(fGroup, SWT.RADIO);
-		fSimpleCheatSheetButton.setText(CSWizardMessages.CSFileWizardPage_simpleCheatSheet);
-		fSimpleCheatSheetButton.setSelection(true);
-		fSimpleCheatSheetButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		// Simple Cheat Sheet Description Label
-		final Label simpleCSLabel = new Label(fGroup, SWT.WRAP);
-		simpleCSLabel.setText(CSWizardMessages.CSFileWizardPage_simpleCheatSheetDesc);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 300;
-		data.horizontalIndent = 20;
-		simpleCSLabel.setLayoutData(data);
-
-		// Composite Cheat Sheet Button
-		fCompositeCheatSheetButton = new Button(fGroup, SWT.RADIO);
-		fCompositeCheatSheetButton.setSelection(false);
-		fCompositeCheatSheetButton.setText(CSWizardMessages.CSFileWizardPage_compositeCheatSheet);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.verticalIndent = 10;
-		fCompositeCheatSheetButton.setLayoutData(data);
-		fCompositeCheatSheetButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		// Composite Cheat Sheet Description Label
-		final Label compositeCSLabel = new Label(fGroup, SWT.WRAP);
-		compositeCSLabel.setText(CSWizardMessages.CSFileWizardPage_compositeCheatSheetDesc);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 300;
-		data.horizontalIndent = 20;
-		compositeCSLabel.setLayoutData(data);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Dialog.applyDialogFont(fGroup);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.CHEAT_SHEET_PAGE);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSWizardMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSWizardMessages.java
deleted file mode 100644
index bfac251..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSWizardMessages.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CSWizardMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.wizards.cheatsheet.messages"; //$NON-NLS-1$
-	
-	public static String BaseCSCreationOperation_task;
-	public static String CompCSCreationOperation_conclusion;
-	public static String CompCSCreationOperation_group;
-	public static String CompCSCreationOperation_intro;
-	public static String CompCSCreationOperation_task;
-	public static String CompCSCreationOperation_title;
-	public static String CSFileWizardPage_compositeCheatSheet;
-	public static String CSFileWizardPage_compositeCheatSheetDesc;
-	public static String CSFileWizardPage_description;
-	public static String CSFileWizardPage_group;
-	public static String CSFileWizardPage_simpleCheatSheet;
-	public static String CSFileWizardPage_simpleCheatSheetDesc;
-	public static String CSFileWizardPage_title;
-	public static String NewCategoryNameDialog_labelDesc;
-	public static String NewCategoryNameDialog_labelText;
-	public static String NewCSFileWizard_title;
-	public static String RegisterCSOperation_errorMessage;
-	public static String RegisterCSOperation_errorMessage2;
-	public static String RegisterCSOperation_task;
-	public static String RegisterCSOperation_task2;
-	public static String RegisterCSOperation_task3;
-	public static String RegisterCSOperation_task4;
-	public static String RegisterCSWizard_title;
-	public static String RegisterCSWizardPage_category;
-	public static String RegisterCSWizardPage_desc;
-	public static String RegisterCSWizardPage_description;
-	public static String RegisterCSWizardPage_descTooltip;
-	public static String RegisterCSWizardPage_group;
-	public static String RegisterCSWizardPage_label;
-	public static String RegisterCSWizardPage_new;
-	public static String RegisterCSWizardPage_newTooltip;
-	public static String RegisterCSWizardPage_none;
-	public static String RegisterCSWizardPage_title;
-	public static String SimpleCSCreationOperation_body;
-	public static String SimpleCSCreationOperation_item;
-	public static String SimpleCSCreationOperation_title;
-	public static String SimpleCSFileWizardPage_description;
-	public static String SimpleCSFileWizardPage_errorMessage;
-	public static String SimpleCSFileWizardPage_title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, CSWizardMessages.class);
-	}
-
-	private CSWizardMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CompCSCreationOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CompCSCreationOperation.java
deleted file mode 100755
index 5ef070b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CompCSCreationOperation.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.pde.internal.ua.core.cheatsheet.comp.CompCSWorkspaceModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.*;
-
-/**
- * CompCSCreationOperation
- */
-public class CompCSCreationOperation extends BaseCSCreationOperation implements IRunnableWithProgress {
-
-	/**
-	 * @param file
-	 */
-	public CompCSCreationOperation(IFile file) {
-		super(file);
-	}
-
-	/**
-	 * @param rule
-	 */
-	public CompCSCreationOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.BaseCheatSheetCreationOperation#createContent()
-	 */
-	protected void createContent() {
-		CompCSWorkspaceModel model = new CompCSWorkspaceModel(fFile, false);
-		initializeCS(model.getCompCS());
-		model.save();
-		model.dispose();
-	}
-
-	/**
-	 * @param compCS
-	 */
-	private void initializeCS(ICompCS compCS) {
-		// Create Task Group
-		// Element: taskGroup
-		ICompCSTaskGroup taskGroup = createBasicGroup(compCS);
-		// Create Task
-		// Element: task
-		ICompCSTask task = createBasicTask(taskGroup);
-		// Configure Group
-		taskGroup.addFieldTaskObject(task);
-		// Configure Cheat Sheet
-		// Attribute: name
-		compCS.setFieldName(CSWizardMessages.CompCSCreationOperation_title);
-		compCS.setFieldTaskObject(taskGroup);
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public static ICompCSTask createBasicTask(ICompCSObject parent) {
-		ICompCSModelFactory factory = parent.getModel().getFactory();
-		// Create Task
-		// Element: task
-		ICompCSTask task = factory.createCompCSTask(parent);
-		// Configure Task
-		// Element: intro
-		ICompCSIntro taskIntro = factory.createCompCSIntro(task);
-		taskIntro.setFieldContent(formatTextBold(CSWizardMessages.CompCSCreationOperation_intro));
-		// Element: onCompletion
-		ICompCSOnCompletion taskConclusion = factory.createCompCSOnCompletion(task);
-		taskConclusion.setFieldContent(formatTextBold(CSWizardMessages.CompCSCreationOperation_conclusion));
-		// Attribute: name
-		task.setFieldName(CSWizardMessages.CompCSCreationOperation_task);
-		// Attribute: kind
-		task.setFieldKind(ICompCSConstants.ATTRIBUTE_VALUE_CHEATSHEET);
-		task.setFieldIntro(taskIntro);
-		task.setFieldOnCompletion(taskConclusion);
-
-		return task;
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	public static ICompCSTaskGroup createBasicGroup(ICompCSObject parent) {
-		ICompCSModelFactory factory = parent.getModel().getFactory();
-		// Create Task Group
-		// Element: taskGroup
-		ICompCSTaskGroup taskGroup = factory.createCompCSTaskGroup(parent);
-		// Configure Task Group
-		// Element: intro
-		ICompCSIntro taskGroupIntro = factory.createCompCSIntro(taskGroup);
-		taskGroupIntro.setFieldContent(formatTextBold(CSWizardMessages.CompCSCreationOperation_intro));
-		// Element: onCompletion
-		ICompCSOnCompletion taskGroupConclusion = factory.createCompCSOnCompletion(taskGroup);
-		taskGroupConclusion.setFieldContent(formatTextBold(CSWizardMessages.CompCSCreationOperation_conclusion));
-		// Attribute: name
-		taskGroup.setFieldName(CSWizardMessages.CompCSCreationOperation_group);
-		// Attribute: kind
-		taskGroup.setFieldKind(ICompCSConstants.ATTRIBUTE_VALUE_SET);
-		taskGroup.setFieldIntro(taskGroupIntro);
-		taskGroup.setFieldOnCompletion(taskGroupConclusion);
-
-		return taskGroup;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/IRegisterCSData.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/IRegisterCSData.java
deleted file mode 100755
index f92db23..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/IRegisterCSData.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * IRegisterCSData
- */
-public interface IRegisterCSData {
-
-	/**
-	 * @return
-	 */
-	public String getDataDescription();
-
-	/**
-	 * @return
-	 */
-	public String getDataCategoryName();
-
-	/**
-	 * @return
-	 */
-	public String getDataCategoryID();
-
-	/**
-	 * @return
-	 */
-	public int getDataCategoryType();
-
-	/**
-	 * @return
-	 */
-	public String getDataContentFile();
-
-	/**
-	 * @return
-	 */
-	public String getDataCheatSheetID();
-
-	/**
-	 * @return
-	 */
-	public String getDataCheatSheetName();
-
-	/**
-	 * @return
-	 */
-	public boolean isCompositeCheatSheet();
-
-	/**
-	 * @return
-	 */
-	public IProject getPluginProject();
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCSFileWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCSFileWizard.java
deleted file mode 100755
index 2c4ff9e..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCSFileWizard.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard;
-
-/**
- * NewCheatSheetWizard
- *
- */
-public class NewCSFileWizard extends BasicNewFileResourceWizard implements INewWizard {
-
-	protected CSFileWizardPage fMainPage;
-
-	/**
-	 * 
-	 */
-	public NewCSFileWizard() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new CSFileWizardPage("cheatsheet", getSelection()); //$NON-NLS-1$
-		addPage(fMainPage);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		super.init(workbench, currentSelection);
-		setWindowTitle(CSWizardMessages.NewCSFileWizard_title);
-		setNeedsProgressMonitor(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#initializeDefaultPageImageDescriptor()
-	 */
-	protected void initializeDefaultPageImageDescriptor() {
-		setDefaultPageImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_CHEATSHEET_WIZ);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			getContainer().run(false, true, getOperation());
-		} catch (InvocationTargetException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return
-	 */
-	private IRunnableWithProgress getOperation() {
-
-		IFile file = fMainPage.createNewFile();
-		int option = fMainPage.getCheatSheetType();
-		if (option == CSFileWizardPage.F_SIMPLE_CHEAT_SHEET) {
-			return new SimpleCSCreationOperation(file);
-		} else if (option == CSFileWizardPage.F_COMPOSITE_CHEAT_SHEET) {
-			return new CompCSCreationOperation(file);
-		}
-		return null;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCategoryNameDialog.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCategoryNameDialog.java
deleted file mode 100755
index 45e3d5b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCategoryNameDialog.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * NewCategoryNameDialog
- */
-public class NewCategoryNameDialog extends TrayDialog {
-
-	private Text fNameText;
-
-	private String fNameTextValue;
-
-	/**
-	 * @param shell
-	 */
-	public NewCategoryNameDialog(Shell shell) {
-		super(shell);
-
-		fNameText = null;
-		fNameTextValue = null;
-	}
-
-	/*
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IHelpContextIds.NEW_CS_CATEGORY_NAME_DIALOG);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-
-		Composite composite = createUI(parent);
-		createListeners();
-		updateUI();
-
-		return composite;
-	}
-
-	/**
-	 * @param parent
-	 */
-	private Composite createUI(Composite parent) {
-		// Create the container
-		Composite container = createUIContainer(parent);
-		// Create the instructional label
-		createUIInstructionLabel(container);
-		// Create the name field
-		createUINameField(container);
-		// Apply the default font to the dialog
-		applyDialogFont(container);
-
-		return container;
-	}
-
-	/**
-	 * 
-	 */
-	private void createListeners() {
-		// NO-OP	
-	}
-
-	/**
-	 * 
-	 */
-	private void updateUI() {
-		// NO-OP
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	private Composite createUIContainer(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		return composite;
-	}
-
-	/**
-	 * @param container
-	 */
-	private void createUIInstructionLabel(Composite container) {
-		Label label = new Label(container, SWT.WRAP);
-		label.setText(CSWizardMessages.NewCategoryNameDialog_labelDesc);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		data.widthHint = 200;
-		label.setLayoutData(data);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUINameField(Composite parent) {
-		// Create the label
-		createUINameLabel(parent);
-		// Create the text widget
-		createUINameText(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUINameLabel(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(CSWizardMessages.NewCategoryNameDialog_labelText);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUINameText(Composite parent) {
-		int style = SWT.BORDER;
-		fNameText = new Text(parent, style);
-		fNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		// This is needed because the widget is disposed before after okay is
-		// pressed before the value can be retrieved
-		fNameTextValue = fNameText.getText();
-		super.okPressed();
-	}
-
-	/**
-	 * @return
-	 */
-	public String getNameText() {
-		return fNameTextValue;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewSimpleCSFileWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewSimpleCSFileWizard.java
deleted file mode 100755
index 16f8cab..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewSimpleCSFileWizard.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-/**
- * NewSimpleCheatSheetFileWizard
- */
-public class NewSimpleCSFileWizard extends NewCSFileWizard {
-
-	/**
-	 * 
-	 */
-	public NewSimpleCSFileWizard() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.NewCheatSheetFileWizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new SimpleCSFileWizardPage(getSelection());
-		addPage(fMainPage);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSOperation.java
deleted file mode 100755
index 96ed990..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSOperation.java
+++ /dev/null

@@ -1,608 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.pde.core.IBaseModel;
-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.*;
-import org.eclipse.pde.internal.core.ClasspathUtilCore;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.TargetPlatformHelper;
-import org.eclipse.pde.internal.core.build.BuildObject;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
-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.text.bundle.BundleSymbolicNameHeader;
-import org.eclipse.pde.internal.core.text.bundle.RequireBundleHeader;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSConstants;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.IPDEUIConstants;
-import org.eclipse.pde.internal.ui.util.ModelModification;
-import org.eclipse.pde.internal.ui.util.PDEModelUtility;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.osgi.framework.Constants;
-
-/**
- * RegisterCSOperation
- */
-public class RegisterCSOperation extends WorkspaceModifyOperation {
-
-	public final static String F_CS_EXTENSION_POINT_ID = "org.eclipse.ui.cheatsheets.cheatSheetContent"; //$NON-NLS-1$
-	public static final String F_CS_EXTENSION_ID = "org.eclipse.ui.cheatsheets"; //$NON-NLS-1$
-	public static final String F_CS_ATTRIBUTE_CONTENT_FILE = "contentFile"; //$NON-NLS-1$
-	public static final String F_CS_ATTRIBUTE_COMPOSITE = "composite"; //$NON-NLS-1$
-
-	private IRegisterCSData fRegisterCSData;
-
-	private Shell fShell;
-
-	/**
-	 * 
-	 */
-	public RegisterCSOperation(IRegisterCSData registerCSData, Shell shell) {
-		fRegisterCSData = registerCSData;
-		fShell = shell;
-	}
-
-	/**
-	 * @param rule
-	 */
-	public RegisterCSOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
-		try {
-			boolean fragment = PluginRegistry.findModel(fRegisterCSData.getPluginProject()).isFragmentModel();
-			IFile file = fRegisterCSData.getPluginProject().getFile(fragment ? ICoreConstants.FRAGMENT_PATH : ICoreConstants.PLUGIN_PATH);
-			// If the plug-in exists modify it accordingly; otherwise, create
-			// a new plug-in file
-			if (file.exists()) {
-				modifyExistingPluginFile(file, monitor);
-			} else {
-				createNewPluginFile(file, monitor);
-			}
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	/**
-	 * FindCSExtensionResult
-	 *
-	 */
-	private static class FindCSExtensionResult {
-
-		public IPluginExtension fCSExtension;
-
-		public IPluginElement fCSElement;
-
-		/**
-		 * 
-		 */
-		public FindCSExtensionResult() {
-			fCSExtension = null;
-			fCSElement = null;
-		}
-
-		/**
-		 * @return
-		 */
-		public boolean foundCSExtension() {
-			return (fCSExtension != null);
-		}
-
-		/**
-		 * @return
-		 */
-		public boolean foundExactCSElement() {
-			return (fCSElement != null);
-		}
-	}
-
-	/**
-	 * @param file
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	private void modifyExistingPluginFile(IFile file, IProgressMonitor monitor) throws CoreException {
-
-		// Validate the operation
-		// Note: This is not accurate, we are validating the plugin.xml file 
-		// but not the manifest.mf file
-		IStatus status = ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {file}, fShell);
-		if (status.getSeverity() != IStatus.OK) {
-			throw new CoreException(new Status(IStatus.ERROR, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.ERROR, CSWizardMessages.RegisterCSOperation_errorMessage, null));
-		}
-		// Perform the modification of the plugin manifest file
-		ModelModification mod = new ModelModification(fRegisterCSData.getPluginProject()) {
-			protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
-				doModifyPluginModel(model, monitor);
-				doModifyManifestModel(model);
-			}
-		};
-		PDEModelUtility.modifyModel(mod, monitor);
-	}
-
-	/**
-	 * @param model
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	private void doModifyPluginModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
-		if ((model instanceof IPluginModelBase) == false) {
-			return;
-		}
-		IPluginModelBase modelBase = (IPluginModelBase) model;
-		// Find an existing cheat sheet extension 
-		FindCSExtensionResult result = findCSExtensionResult(modelBase);
-		// Check search results and act accordingly
-		if (result.foundCSExtension() && result.foundExactCSElement()) {
-			// An exact match to an existing cheat sheet element was
-			// found.  Update the elements description and category
-			// fields
-			modifyExistingElement(result.fCSElement, monitor);
-			// Create the category if necessary
-			// Category element
-			IPluginElement categoryElement = createElementCategory(result.fCSExtension);
-			if (categoryElement != null) {
-				result.fCSExtension.add(categoryElement);
-			}
-		} else if (result.foundCSExtension()) {
-			// No exact match to an existing cheat sheet element found within
-			// the existing cheat sheet extension.  Update the 
-			// existing extension by adding a new cheat sheet element
-			// to it
-			modifyExistingExtension(result.fCSExtension, monitor);
-		} else {
-			// No existing cheat sheet extension found, create a new
-			// extension
-			insertNewExtension(modelBase, monitor);
-		}
-	}
-
-	/**
-	 * @param modelBase
-	 */
-	private void insertNewExtension(IPluginModelBase modelBase, IProgressMonitor monitor) throws CoreException {
-		// Update progress work units
-		monitor.beginTask(CSWizardMessages.RegisterCSOperation_task, 1);
-		// Create the new extension
-		IPluginExtension extension = createExtensionCheatSheet(modelBase);
-		modelBase.getPluginBase().add(extension);
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param extension
-	 */
-	private void modifyExistingExtension(IPluginExtension extension, IProgressMonitor monitor) throws CoreException {
-		// Update progress work units
-		monitor.beginTask(CSWizardMessages.RegisterCSOperation_task2, 1);
-		// Create new children for existing extension
-		createExtensionChildren(extension);
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param csElement
-	 * @param monitor
-	 */
-	private void modifyExistingElement(IPluginElement csElement, IProgressMonitor monitor) throws CoreException {
-		// Update progress work units
-		monitor.beginTask(CSWizardMessages.RegisterCSOperation_task3, 1);
-		// Leave id attribute the same
-		// Update the name
-		// Attribute: name
-		csElement.setAttribute(ICompCSConstants.ATTRIBUTE_NAME, fRegisterCSData.getDataCheatSheetName());
-		// Attribute: category
-		// Update the category.
-		// if "<none>" was selected, clear the entry
-		String categoryID = fRegisterCSData.getDataCategoryID();
-		if (categoryID == null) {
-			categoryID = ""; //$NON-NLS-1$
-		}
-		csElement.setAttribute(RegisterCSWizardPage.F_CS_ELEMENT_CATEGORY, categoryID);
-		// Leave contentFile attribute the same
-		// Leave composite attribute the same
-		// Element: description
-		// Update an existing description if one is found; otherwise, 
-		// Create a new description
-		IPluginElement descriptionElement = findExistingDescription(csElement);
-		if (descriptionElement == null) {
-			// Create a new description element
-			descriptionElement = createElementDescription(csElement);
-			if (descriptionElement != null) {
-				csElement.add(descriptionElement);
-			}
-		} else {
-			// Modify the existing description element
-			boolean modified = modifyExistingDescription(descriptionElement);
-			if (modified == false) {
-				// New description is not defined, remove the existing 
-				// description element
-				csElement.remove(descriptionElement);
-			}
-		}
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param descriptionElement
-	 */
-	private boolean modifyExistingDescription(IPluginElement element) throws CoreException {
-		// If the new description is defined set it on the existing description
-		// element; otherwise, delete the existing description element
-		if (PDETextHelper.isDefinedAfterTrim(fRegisterCSData.getDataDescription())) {
-			element.setText(fRegisterCSData.getDataDescription().trim());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param csElement
-	 * @throws CoreException
-	 */
-	private IPluginElement findExistingDescription(IPluginElement csElement) throws CoreException {
-
-		if (csElement.getChildCount() > 0) {
-			IPluginObject pluginObject = csElement.getChildren()[0];
-			if (pluginObject instanceof IPluginElement) {
-				IPluginElement element = (IPluginElement) pluginObject;
-				if (element.getName().equals(RegisterCSWizardPage.F_CS_ELEMENT_DESCRIPTION)) {
-					return element;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param model
-	 * @param extensionResult cheat sheet extension found or null
-	 * @param elementResult cheat sheet element found or null
-	 * @return
-	 */
-	private FindCSExtensionResult findCSExtensionResult(IPluginModelBase model) {
-		// Container for result
-		FindCSExtensionResult result = new FindCSExtensionResult();
-		// Find all cheat sheet extensions within the host plug-in
-		IPluginExtension[] extensions = findCheatSheetExtensions(model);
-		// Process all cheat sheet extensions
-		// Extension search results
-		// (1) An existing extension containing a cheatsheet element with the 
-		//     exact cheat sheet ID
-		// (2) An existing extension (last one found) containing 0 or more 
-		//     cheatsheet or category elements
-		// (3) No existing extension
-		for (int i = 0; i < extensions.length; i++) {
-			// Cheat sheet extension match found
-			result.fCSExtension = extensions[i];
-			// Check for children
-			if (extensions[i].getChildCount() == 0) {
-				// Extension has no children, skip to the next extension
-				continue;
-			}
-			IPluginObject[] pluginObjects = extensions[i].getChildren();
-			// Process all children
-			for (int j = 0; j < pluginObjects.length; j++) {
-				if (pluginObjects[j] instanceof IPluginElement) {
-					IPluginElement element = (IPluginElement) pluginObjects[j];
-					// Find cheat sheet elements
-					if (element.getName().equals(RegisterCSWizardPage.F_CS_ELEMENT_CHEATSHEET)) {
-						// Cheat sheet element
-						// Get the id attribute
-						IPluginAttribute idAttribute = element.getAttribute(ICompCSConstants.ATTRIBUTE_ID);
-						// Check for the generated ID for this cheat sheet
-						// element
-						if ((idAttribute != null) && PDETextHelper.isDefined(idAttribute.getValue()) && fRegisterCSData.getDataCheatSheetID().equals(idAttribute.getValue())) {
-							// Matching cheat sheet element found
-							result.fCSElement = element;
-							return result;
-						}
-					}
-
-				}
-			}
-		}
-		return result;
-	}
-
-	public static IPluginExtension[] findCheatSheetExtensions(ISharedExtensionsModel model) {
-		IPluginExtension[] extensions = model.getExtensions().getExtensions();
-
-		ArrayList csExtensions = new ArrayList();
-		for (int i = 0; i < extensions.length; i++) {
-			String point = extensions[i].getPoint();
-			if (F_CS_EXTENSION_POINT_ID.equals(point)) {
-				csExtensions.add(extensions[i]);
-			}
-		}
-		return (IPluginExtension[]) csExtensions.toArray(new IPluginExtension[csExtensions.size()]);
-	}
-
-	/**
-	 * @param file
-	 * @param monitor
-	 */
-	private void createNewPluginFile(IFile file, IProgressMonitor monitor) throws CoreException {
-
-		// Update progress work units
-		monitor.beginTask(CSWizardMessages.RegisterCSOperation_task4, 4);
-		// Create the plug-in model
-		WorkspacePluginModelBase model = (WorkspacePluginModelBase) createModel(file);
-		// Update progress work units
-		monitor.worked(1);
-
-		IPluginBase base = model.getPluginBase();
-		base.setSchemaVersion(TargetPlatformHelper.getSchemaVersion());
-		// Create the cheat sheet extension
-		base.add(createExtensionCheatSheet(model));
-		// Update progress work units
-		monitor.worked(1);
-		// Save the model to file
-		model.save();
-		// Update progress work units
-		monitor.worked(1);
-		// Update the MANIFEST.MF file to ensure the singleton directive is set
-		// to true
-		modifyExistingManifestFile(file);
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param model
-	 */
-	private void modifyExistingManifestFile(IFile file) throws CoreException {
-		// Validate the operation
-		// Note: This is not accurate, we are validating the plugin.xml file rather
-		// than the manifest file
-		IStatus status = ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {file}, fShell);
-		if (status.getSeverity() != IStatus.OK) {
-			throw new CoreException(new Status(IStatus.ERROR, IPDEUIConstants.PLUGIN_ID, IStatus.ERROR, CSWizardMessages.RegisterCSOperation_errorMessage2, null));
-		}
-		// Perform the modification of the manifest file
-		ModelModification mod = new ModelModification(fRegisterCSData.getPluginProject()) {
-			protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
-				doModifyManifestModel(model);
-				doModifyBuildModel(model);
-			}
-		};
-		PDEModelUtility.modifyModel(mod, null);
-	}
-
-	/**
-	 * @param model
-	 */
-	private void doModifyManifestModel(IBaseModel model) {
-		// Make sure we have a base model
-		if ((model instanceof IBundlePluginModelBase) == false) {
-			return;
-		}
-		IBundlePluginModelBase modelBase = (IBundlePluginModelBase) model;
-		IBundle bundle = modelBase.getBundleModel().getBundle();
-		// Get the heading specifying the singleton declaration 
-		IManifestHeader header = bundle.getManifestHeader(Constants.BUNDLE_SYMBOLICNAME);
-		if (header instanceof BundleSymbolicNameHeader) {
-			BundleSymbolicNameHeader symbolic = (BundleSymbolicNameHeader) header;
-			// If the singleton declaration is false, change it to true
-			// This is required because plug-ins that specify extensions
-			// must be singletons.
-			if (symbolic.isSingleton() == false) {
-				symbolic.setSingleton(true);
-			}
-		}
-		// Add the cheat sheets plug-in to the list of required bundles
-		header = bundle.getManifestHeader(Constants.REQUIRE_BUNDLE);
-		if (header instanceof RequireBundleHeader) {
-			RequireBundleHeader require = (RequireBundleHeader) header;
-			if (require.hasElement(F_CS_EXTENSION_ID) == false) {
-				require.addBundle(F_CS_EXTENSION_ID);
-			}
-		}
-	}
-
-	/**
-	 * @param model
-	 */
-	private void doModifyBuildModel(IBaseModel model) throws CoreException {
-		// Make sure we have a base model
-		if ((model instanceof IPluginModelBase) == false) {
-			return;
-		}
-		IPluginModelBase modelBase = (IPluginModelBase) model;
-		IBuild build = ClasspathUtilCore.getBuild(modelBase);
-		// Make sure we have a plugin.properties file
-		if (build == null) {
-			return;
-		}
-		// Get the entry for bin.includes
-		IBuildEntry entry = build.getEntry(IBuildEntry.BIN_INCLUDES);
-		if (entry == null) {
-			// This should never happen since the manifest.mf file exists and
-			// it has to be in the bin.includes
-			return;
-		}
-		// Add the plugin.xml file to the bin.includes build entry if it does
-		// not exist
-		if (entry.contains(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) == false) {
-			entry.addToken(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
-		}
-		// There does not seem to be any support in PDEModelUtility or the 
-		// ModelModification framework to save build.properties modifications
-		// As a result, explicitly do that here
-		if (build instanceof BuildObject) {
-			IBuildModel buildModel = ((BuildObject) build).getModel();
-			if (buildModel instanceof WorkspaceBuildModel) {
-				((WorkspaceBuildModel) buildModel).save();
-			}
-		}
-	}
-
-	/**
-	 * @param file
-	 * @return
-	 */
-	private IPluginModelBase createModel(IFile file) {
-		if (file.getProjectRelativePath().equals(ICoreConstants.FRAGMENT_PATH)) {
-			return new WorkspaceFragmentModel(file, false);
-		}
-		return new WorkspacePluginModel(file, false);
-	}
-
-	/**
-	 * @param model
-	 * @return
-	 * @throws CoreException
-	 */
-	private IPluginExtension createExtensionCheatSheet(IPluginModelBase model) throws CoreException {
-		IPluginExtension extension = model.getFactory().createExtension();
-		// Point
-		extension.setPoint(F_CS_EXTENSION_POINT_ID);
-		// NO id
-		// NO name 
-
-		createExtensionChildren(extension);
-
-		return extension;
-	}
-
-	/**
-	 * @param extension
-	 * @throws CoreException
-	 */
-	private void createExtensionChildren(IPluginExtension extension) throws CoreException {
-		// Category element
-		IPluginElement categoryElement = createElementCategory(extension);
-		if (categoryElement != null) {
-			extension.add(categoryElement);
-		}
-		// Cheatsheet element
-		IPluginElement cheatSheetElement = createElementCheatSheet(extension);
-		if (cheatSheetElement != null) {
-			extension.add(cheatSheetElement);
-		}
-	}
-
-	/**
-	 * @param extension
-	 * @return
-	 * @throws CoreException
-	 */
-	private IPluginElement createElementCategory(IPluginExtension extension) throws CoreException {
-		// Do not create the category if "<none>" was selected
-		String categoryID = fRegisterCSData.getDataCategoryID();
-		if (categoryID == null) {
-			return null;
-		}
-		// Do not create the category if it is an old category type
-		int type = fRegisterCSData.getDataCategoryType();
-		if (type != CSCategoryTrackerUtil.F_TYPE_NEW_CATEGORY) {
-			return null;
-		}
-		// Create the element
-		IPluginElement element = extension.getModel().getFactory().createElement(extension);
-		// Element: category
-		element.setName(RegisterCSWizardPage.F_CS_ELEMENT_CATEGORY);
-		// Attribute: id
-		element.setAttribute(ICompCSConstants.ATTRIBUTE_ID, categoryID);
-		// Attribute: name
-		// Already trimmed
-		element.setAttribute(ICompCSConstants.ATTRIBUTE_NAME, fRegisterCSData.getDataCategoryName());
-
-		return element;
-	}
-
-	/**
-	 * @param extension
-	 * @return
-	 * @throws CoreException
-	 */
-	private IPluginElement createElementCheatSheet(IPluginExtension extension) throws CoreException {
-
-		IPluginElement element = extension.getModel().getFactory().createElement(extension);
-		// Element: cheatsheet
-		element.setName(RegisterCSWizardPage.F_CS_ELEMENT_CHEATSHEET);
-		// Attribute: id
-		element.setAttribute(ICompCSConstants.ATTRIBUTE_ID, fRegisterCSData.getDataCheatSheetID());
-		// Attribute: name
-		element.setAttribute(ICompCSConstants.ATTRIBUTE_NAME, fRegisterCSData.getDataCheatSheetName());
-		// Attribute: category
-		// Create the category only if "<none>" was not selected
-		String categoryID = fRegisterCSData.getDataCategoryID();
-		if (categoryID != null) {
-			element.setAttribute(RegisterCSWizardPage.F_CS_ELEMENT_CATEGORY, categoryID);
-		}
-		// Attribute: contentFile
-		element.setAttribute(F_CS_ATTRIBUTE_CONTENT_FILE, fRegisterCSData.getDataContentFile());
-		// Attribute: composite
-		element.setAttribute(F_CS_ATTRIBUTE_COMPOSITE, Boolean.toString(fRegisterCSData.isCompositeCheatSheet()));
-		// Element: description
-		IPluginElement descriptionElement = createElementDescription(element);
-		if (descriptionElement != null) {
-			element.add(descriptionElement);
-		}
-
-		return element;
-	}
-
-	/**
-	 * @param parentElement
-	 * @return
-	 * @throws CoreException
-	 */
-	private IPluginElement createElementDescription(IPluginElement parentElement) throws CoreException {
-		// Define the description element only if description text was 
-		// specified 
-		String descriptionText = fRegisterCSData.getDataDescription();
-		if (PDETextHelper.isDefinedAfterTrim(descriptionText) == false) {
-			return null;
-		}
-		// Create the element
-		IPluginElement element = parentElement.getModel().getFactory().createElement(parentElement);
-		// Element: description
-		element.setName(ISimpleCSConstants.ELEMENT_DESCRIPTION);
-		// Content
-		element.setText(descriptionText.trim());
-
-		return element;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java
deleted file mode 100755
index ca51b13..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * NewRegisterCSWizard
- */
-public class RegisterCSWizard extends Wizard implements INewWizard {
-
-	private RegisterCSWizardPage fMainPage;
-
-	private IModel fModel;
-
-	/**
-	 * 
-	 */
-	public RegisterCSWizard(IModel model) {
-		fModel = model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		if (fModel instanceof ICompCSModel) {
-			fMainPage = new RegisterCompCSWizardPage((ICompCSModel) fModel);
-		} else if (fModel instanceof ISimpleCSModel) {
-			fMainPage = new RegisterSimpleCSWizardPage((ISimpleCSModel) fModel);
-		}
-
-		addPage(fMainPage);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			getContainer().run(false, true, getOperation());
-		} catch (InvocationTargetException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return
-	 */
-	private IRunnableWithProgress getOperation() {
-		return new RegisterCSOperation(fMainPage, getShell());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(CSWizardMessages.RegisterCSWizard_title);
-		// TODO: MP: LOW: CompCS: New register cheat sheet wizard image
-		setDefaultPageImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_CHEATSHEET_WIZ);
-		setNeedsProgressMonitor(true);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java
deleted file mode 100755
index 59a0626..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java
+++ /dev/null

@@ -1,633 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-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.*;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * RegisterCSWizardPage
- */
-public abstract class RegisterCSWizardPage extends WizardPage implements IRegisterCSData {
-
-	public final static String F_PAGE_NAME = "register-cs"; //$NON-NLS-1$	
-
-	public final static String F_CS_ELEMENT_CATEGORY = "category"; //$NON-NLS-1$
-
-	public final static String F_CS_ELEMENT_CHEATSHEET = "cheatsheet"; //$NON-NLS-1$
-
-	public final static String F_CS_ELEMENT_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	private final static String F_LOCALE_VARIABLE = "$nl$/"; //$NON-NLS-1$
-
-	private Combo fCategoryCombo;
-
-	private Button fCategoryButton;
-
-	private Text fDescriptionText;
-
-	protected IModel fCheatSheetModel;
-
-	private ISharedExtensionsModel fExtensionsModel;
-
-	private IProject fPluginProject;
-
-	private String fDataCategoryName;
-
-	private String fDataDescription;
-
-	private String fDataCheatSheetID;
-
-	private CSCategoryTrackerUtil fCategoryTrackerUtil;
-
-	/**
-	 * @param pageName
-	 */
-	public RegisterCSWizardPage(IModel model) {
-		super(F_PAGE_NAME);
-
-		fCheatSheetModel = model;
-		initialize();
-	}
-
-	/**
-	 * 
-	 */
-	private void initialize() {
-
-		setTitle(CSWizardMessages.RegisterCSWizardPage_title);
-		setDescription(CSWizardMessages.RegisterCSWizardPage_description);
-
-		fCategoryCombo = null;
-		fCategoryButton = null;
-		fDescriptionText = null;
-
-		fCategoryTrackerUtil = new CSCategoryTrackerUtil();
-
-		fDataCategoryName = null;
-		fDataDescription = null;
-
-		// Get the project the cheat sheet is stored in
-		fPluginProject = fCheatSheetModel.getUnderlyingResource().getProject();
-
-		fDataCheatSheetID = generateCheatSheetID();
-
-		initializePluginModel();
-	}
-
-	/**
-	 * 
-	 */
-	private void initializePluginModel() {
-		IPluginModelBase base = PluginRegistry.findModel(getPluginProject());
-		// should never happen
-		if (base == null)
-			return;
-		if (base instanceof IBundlePluginModelBase)
-			fExtensionsModel = ((IBundlePluginModelBase) base).getExtensionsModel();
-		else
-			fExtensionsModel = base;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.IRegisterCSData#getDataDescription()
-	 */
-	public String getDataDescription() {
-		return fDataDescription;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.IRegisterCSData#getDataCategoryName()
-	 */
-	public String getDataCategoryName() {
-		return fDataCategoryName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.IRegisterCSData#getDataCategoryType()
-	 */
-	public int getDataCategoryType() {
-		String categoryID = getDataCategoryID();
-		if (categoryID == null) {
-			return CSCategoryTrackerUtil.F_TYPE_NO_CATEGORY;
-		}
-		return fCategoryTrackerUtil.getCategoryType(categoryID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.IRegisterCSData#getDataCategoryID()
-	 */
-	public String getDataCategoryID() {
-		if (fDataCategoryName != null) {
-			return fCategoryTrackerUtil.getCategoryID(fDataCategoryName);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.IRegisterCSData#getDataContentFile()
-	 */
-	public String getDataContentFile() {
-		// Retrieve the project relative path to the cheat sheet
-		String portablePath = fCheatSheetModel.getUnderlyingResource().getProjectRelativePath().toPortableString();
-		// Prepend the locale specific variable
-		return F_LOCALE_VARIABLE + portablePath;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.IRegisterCSData#getDataCheatSheetID()
-	 */
-	public String getDataCheatSheetID() {
-		return fDataCheatSheetID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.IRegisterCSData#getPluginProject()
-	 */
-	public IProject getPluginProject() {
-		return fPluginProject;
-	}
-
-	/**
-	 * @return
-	 */
-	public abstract String getDataCheatSheetName();
-
-	/**
-	 * @return
-	 */
-	public abstract boolean isCompositeCheatSheet();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-
-		createUI(parent);
-		createUIListeners();
-
-		updateUI();
-		validateUI();
-
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUI(Composite parent) {
-		// Create the container
-		Composite container = createUIContainer(parent);
-		// Create the label
-		createUILabel(container);
-		// Create the group
-		Group group = createUIGroup(container);
-		// Create the category field
-		createUICategoryField(group);
-		// Create the description field
-		createUIDescriptionField(group);
-		// Set the control for the reciever
-		// Must be done otherwise a null assertion error is generated
-		setControl(container);
-		// Apply the dialog font to all controls using the default font
-		Dialog.applyDialogFont(container);
-
-		// Provide functionality for the help button
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.REGISTER_CS);
-	}
-
-	/**
-	 * @param container
-	 */
-	private void createUILabel(Composite container) {
-		Label label = new Label(container, SWT.WRAP);
-		label.setText(CSWizardMessages.RegisterCSWizardPage_label);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 300;
-		label.setLayoutData(data);
-	}
-
-	/**
-	 * @param container
-	 * @return
-	 */
-	private Group createUIGroup(Composite container) {
-		Group group = new Group(container, SWT.NONE);
-		GridLayout layout = new GridLayout(3, false);
-		layout.marginWidth = 6;
-		layout.marginHeight = 6;
-		group.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		data.verticalIndent = 10;
-		group.setLayoutData(data);
-		group.setText(CSWizardMessages.RegisterCSWizardPage_group);
-		return group;
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	private Composite createUIContainer(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		container.setLayout(layout);
-		return container;
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUICategoryField(Composite parent) {
-		// Create the label
-		createUICategoryLabel(parent);
-		// Create the combo
-		createUICategoryCombo(parent);
-		// Create the button
-		createUICategoryButton(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUICategoryLabel(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(CSWizardMessages.RegisterCSWizardPage_category);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUICategoryCombo(Composite parent) {
-		int style = SWT.READ_ONLY | SWT.BORDER;
-		fCategoryCombo = new Combo(parent, style);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		fCategoryCombo.setLayoutData(data);
-		fCategoryCombo.add(CSWizardMessages.RegisterCSWizardPage_none);
-		fCategoryCombo.setText(CSWizardMessages.RegisterCSWizardPage_none);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUICategoryButton(Composite parent) {
-		fCategoryButton = new Button(parent, SWT.PUSH);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		data.widthHint = 50;
-		fCategoryButton.setLayoutData(data);
-		fCategoryButton.setText(CSWizardMessages.RegisterCSWizardPage_new);
-		fCategoryButton.setToolTipText(CSWizardMessages.RegisterCSWizardPage_newTooltip);
-		SWTUtil.setButtonDimensionHint(fCategoryButton);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIDescriptionField(Composite parent) {
-		// Create the label
-		createUIDescriptionLabel(parent);
-		// Create the text widget
-		createUIDescriptionText(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIDescriptionLabel(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(CSWizardMessages.RegisterCSWizardPage_desc);
-		int style = GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_END;
-		GridData data = new GridData(style);
-		label.setLayoutData(data);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUIDescriptionText(Composite parent) {
-		int style = SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.BORDER;
-		fDescriptionText = new Text(parent, style);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.heightHint = 60;
-		data.horizontalSpan = 2;
-		fDescriptionText.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListeners() {
-		// Create listeners for the category button
-		createUIListenersCategoryButton();
-		// Create listeners for the category combo box
-		createUIListenersCategoryCombo();
-		// Create listeners for the description text
-		createUIListenersDescriptionText();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersCategoryButton() {
-		fCategoryButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleWidgetSelectedCategoryButton();
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersCategoryCombo() {
-		fCategoryCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				fDataCategoryName = fCategoryCombo.getText();
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersDescriptionText() {
-		fDescriptionText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				fDataDescription = fDescriptionText.getText();
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void handleWidgetSelectedCategoryButton() {
-		// Create a dialog allowing the user to input the category name
-		NewCategoryNameDialog dialog = new NewCategoryNameDialog(PDEUserAssistanceUIPlugin.getActiveWorkbenchShell());
-		dialog.create();
-		dialog.getShell().setText(CSWizardMessages.RegisterCSWizardPage_descTooltip);
-
-		if (dialog.open() == Window.OK) {
-			String newCategoryName = dialog.getNameText();
-
-			if (PDETextHelper.isDefinedAfterTrim(newCategoryName)) {
-				String trimmedText = newCategoryName.trim();
-				fCategoryCombo.add(trimmedText);
-				fCategoryCombo.setText(trimmedText);
-				fCategoryCombo.setFocus();
-				String id = generateCategoryID(trimmedText);
-				fCategoryTrackerUtil.associate(id, trimmedText, CSCategoryTrackerUtil.F_TYPE_NEW_CATEGORY);
-			}
-		}
-
-	}
-
-	/**
-	 * 
-	 */
-	private void updateUI() {
-
-		if (fExtensionsModel != null) {
-			// Find all cheat sheet extensions within the host plug-in
-			IPluginExtension[] extensions = RegisterCSOperation.findCheatSheetExtensions(fExtensionsModel);
-			// Process all category elements
-			processCategoryElements(extensions);
-			// Process all cheat sheet elements
-			processCheatSheetElements(extensions);
-		}
-	}
-
-	/**
-	 * @param extensions
-	 */
-	private void processCategoryElements(IPluginExtension[] extensions) {
-		// Linear search:  Process all cheat sheet extensions found
-		for (int i = 0; i < extensions.length; i++) {
-			if (extensions[i].getChildCount() == 0) {
-				// Extension has no children, skip to the next extension
-				continue;
-			}
-			IPluginExtension extension = extensions[i];
-			IPluginObject[] pluginObjects = extension.getChildren();
-			// Process all children
-			for (int j = 0; j < pluginObjects.length; j++) {
-				if (pluginObjects[j] instanceof IPluginElement) {
-					IPluginElement element = (IPluginElement) pluginObjects[j];
-					if (element.getName().equals(F_CS_ELEMENT_CATEGORY)) {
-						// Category element
-						// Update the category combo
-						updateUICategoryComboElement(element);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param extensions
-	 */
-	private void processCheatSheetElements(IPluginExtension[] extensions) {
-		// Query cheat sheet extensions for information required to update
-		// the description text and category combo widgets
-		// Linear search:  Process all cheat sheet extensions found
-		for (int i = 0; i < extensions.length; i++) {
-			if (extensions[i].getChildCount() == 0) {
-				// Extension has no children, skip to the next extension
-				continue;
-			}
-			IPluginExtension extension = extensions[i];
-			IPluginObject[] pluginObjects = extension.getChildren();
-			// Process all children
-			for (int j = 0; j < pluginObjects.length; j++) {
-				if (pluginObjects[j] instanceof IPluginElement) {
-					IPluginElement element = (IPluginElement) pluginObjects[j];
-					if (element.getName().equals(F_CS_ELEMENT_CHEATSHEET)) {
-						// Cheat sheet element
-						processCheatSheetElement(element, fDataCheatSheetID);
-					}
-
-				}
-			}
-		}
-	}
-
-	/**
-	 * Process category elements
-	 * @param parentElement
-	 */
-	private void updateUICategoryComboElement(IPluginElement parentElement) {
-		// Get the id attribute
-		IPluginAttribute idAttribute = parentElement.getAttribute(ICompCSConstants.ATTRIBUTE_ID);
-		// Get the name attribute
-		IPluginAttribute nameAttribute = parentElement.getAttribute(ICompCSConstants.ATTRIBUTE_NAME);
-		// Add the category to the combo box only if
-		// (1) the category name is defined
-		// (2) the category has not already been added to the combo box
-		if ((nameAttribute != null) && PDETextHelper.isDefined(nameAttribute.getValue()) && (idAttribute != null) && PDETextHelper.isDefined(idAttribute.getValue()) && (fCategoryTrackerUtil.containsCategoryName(nameAttribute.getValue()) == false)) {
-			// TODO: MP: LOW: CompCS: Reference translated value
-			fCategoryCombo.add(nameAttribute.getValue());
-			// Assocate the category ID with the category name
-			fCategoryTrackerUtil.associate(idAttribute.getValue(), nameAttribute.getValue(), CSCategoryTrackerUtil.F_TYPE_OLD_CATEGORY);
-		}
-	}
-
-	/**
-	 * Process cheatsheet elements with a category attribute
-	 * @param parentElement
-	 */
-	private void updateUICategoryComboAttribute(IPluginElement element) {
-		// Get the category attribute
-		IPluginAttribute categoryAttribute = element.getAttribute(F_CS_ELEMENT_CATEGORY);
-		// Process the category attribute
-		if ((categoryAttribute != null) && PDETextHelper.isDefined(categoryAttribute.getValue())) {
-			String id = categoryAttribute.getValue();
-			// Check to see if the category ID has been defined
-			if (fCategoryTrackerUtil.containsCategoryID(id)) {
-				// Update the category combo selection
-				String name = fCategoryTrackerUtil.getCategoryName(id);
-				fCategoryCombo.setText(name);
-			} else {
-				// Add the category ID to the combo box (no assoicated name)
-				// This can only happen if the category is defined outside of
-				// the plug-in the cheat sheet is stored in
-				fCategoryCombo.add(id);
-				fCategoryCombo.setText(id);
-				fCategoryTrackerUtil.associate(id, id, CSCategoryTrackerUtil.F_TYPE_OLD_CATEGORY);
-			}
-		}
-	}
-
-	/**
-	 * @param extensions
-	 */
-	private void processCheatSheetElement(IPluginElement parentElement, String generatedID) {
-		// Get the id attribute
-		IPluginAttribute idAttribute = parentElement.getAttribute(ICompCSConstants.ATTRIBUTE_ID);
-
-		// Check for the generated ID for this cheat sheet
-		// If a cheat sheet exists with the generated ID already, read its
-		// description and populate the description text accordingly		
-		if ((idAttribute != null) && PDETextHelper.isDefined(idAttribute.getValue()) && generatedID.equals(idAttribute.getValue())) {
-			// Matching cheat sheet extension found
-			// Process children if any
-			if (parentElement.getChildCount() > 0) {
-				// Update the description text widget
-				updateUIDescriptionText(parentElement);
-			}
-			updateUICategoryComboAttribute(parentElement);
-		}
-	}
-
-	/**
-	 * @param parentElement
-	 */
-	private void updateUIDescriptionText(IPluginElement parentElement) {
-		IPluginObject pluginObject = parentElement.getChildren()[0];
-		if (pluginObject instanceof IPluginElement) {
-			IPluginElement element = (IPluginElement) pluginObject;
-			if (element.getName().equals(F_CS_ELEMENT_DESCRIPTION) && PDETextHelper.isDefinedAfterTrim(element.getText())) {
-				// Triggers listener to update data description on load
-				fDescriptionText.setText(element.getText().trim());
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void validateUI() {
-		setPageComplete(true);
-	}
-
-	/**
-	 * @param model
-	 * @param extensionPointID
-	 * @return
-	 */
-	public IPluginExtension[] findExtensions(ISharedExtensionsModel model, String extensionPointID) {
-		IPluginExtension[] extensions = model.getExtensions().getExtensions();
-
-		ArrayList csExtensions = new ArrayList();
-		for (int i = 0; i < extensions.length; i++) {
-			String point = extensions[i].getPoint();
-			if (extensionPointID.equals(point)) {
-				csExtensions.add(extensions[i]);
-			}
-		}
-		return (IPluginExtension[]) csExtensions.toArray(new IPluginExtension[csExtensions.size()]);
-	}
-
-	/**
-	 * @return
-	 */
-	private String generateCheatSheetID() {
-		// Generate the hash code using the full path
-		long uniqueID = hash(fCheatSheetModel.getUnderlyingResource().getFullPath().toPortableString());
-		// Qualify with the project name
-		// Append the hash code to make the name unique and allow cheat sheets
-		// with the same name (but different directories) be registered 
-		// individually
-		String result = fPluginProject.getName() + '.' + F_CS_ELEMENT_CHEATSHEET + uniqueID;
-		return result;
-	}
-
-	/**
-	 * @return
-	 */
-	private String generateCategoryID(String name) {
-		// Generate the hash code using the category name
-		long uniqueID = hash(name);
-		// Qualify with the project name
-		// Append the hash code to make the name unique 
-		String result = fPluginProject.getName() + '.' + F_CS_ELEMENT_CATEGORY + uniqueID;
-		return result;
-	}
-
-	/**
-	 * @param string
-	 * @return
-	 */
-	private long hash(String string) {
-		int b = 378551;
-		int a = 63689;
-		long hash = 0;
-
-		for (int i = 0; i < string.length(); i++) {
-			hash = hash * a + string.charAt(i);
-			a = a * b;
-		}
-		return (hash & 0x7FFFFFFF);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCompCSWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCompCSWizardPage.java
deleted file mode 100755
index 18e6fbf..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCompCSWizardPage.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.icheatsheet.comp.ICompCSModel;
-
-/**
- * RegisterCompCSWizardPage
- */
-public class RegisterCompCSWizardPage extends RegisterCSWizardPage {
-
-	/**
-	 * @param model
-	 */
-	public RegisterCompCSWizardPage(ICompCSModel model) {
-		super(model);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.RegisterCSWizardPage#getDataName()
-	 */
-	public String getDataCheatSheetName() {
-		return ((ICompCSModel) fCheatSheetModel).getCompCS().getFieldName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.RegisterCSWizardPage#isCompositeCheatSheet()
-	 */
-	public boolean isCompositeCheatSheet() {
-		return true;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterSimpleCSWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterSimpleCSWizardPage.java
deleted file mode 100755
index 04841d5..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterSimpleCSWizardPage.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.ISimpleCSModel;
-
-/**
- * RegisterSimpleCSWizardPage
- */
-public class RegisterSimpleCSWizardPage extends RegisterCSWizardPage {
-
-	/**
-	 * @param model
-	 */
-	public RegisterSimpleCSWizardPage(ISimpleCSModel model) {
-		super(model);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.RegisterCSWizardPage#getDataName()
-	 */
-	public String getDataCheatSheetName() {
-		return ((ISimpleCSModel) fCheatSheetModel).getSimpleCS().getTitle();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.RegisterCSWizardPage#isCompositeCheatSheet()
-	 */
-	public boolean isCompositeCheatSheet() {
-		return false;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSCreationOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSCreationOperation.java
deleted file mode 100755
index 060ab01..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSCreationOperation.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.*;
-import org.eclipse.pde.internal.ua.core.cheatsheet.simple.text.SimpleCSModel;
-
-/**
- * SimpleCheatSheetCreationOperation
- */
-public class SimpleCSCreationOperation extends BaseCSCreationOperation {
-
-	/**
-	 * @param file
-	 */
-	public SimpleCSCreationOperation(IFile file) {
-		super(file);
-	}
-
-	/**
-	 * @param rule
-	 */
-	public SimpleCSCreationOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	/**
-	 * 
-	 */
-	protected void createContent() throws CoreException {
-		SimpleCSModel model = new SimpleCSModel(CoreUtility.getTextDocument(fFile.getContents()), false);
-		model.setUnderlyingResource(fFile);
-		initializeCS(model.getSimpleCS());
-		model.save();
-		model.dispose();
-	}
-
-	/**
-	 * @param simpleCS
-	 */
-	protected void initializeCS(ISimpleCS simpleCS) {
-		ISimpleCSModelFactory factory = simpleCS.getModel().getFactory();
-
-		// Element: intro
-		ISimpleCSIntro intro = factory.createSimpleCSIntro(simpleCS);
-		// Element: description
-		ISimpleCSDescription description = factory.createSimpleCSDescription(intro);
-		description.setContent(formatTextBold(CSWizardMessages.SimpleCSCreationOperation_body));
-		intro.setDescription(description);
-
-		// Element: item
-		ISimpleCSItem item = factory.createSimpleCSItem(simpleCS);
-		item.setTitle(CSWizardMessages.SimpleCSCreationOperation_item);
-		// Element: description
-		ISimpleCSDescription description2 = factory.createSimpleCSDescription(item);
-		description2.setContent(formatTextBold(CSWizardMessages.SimpleCSCreationOperation_body));
-		item.setDescription(description2);
-
-		// Attribute: title
-		simpleCS.setTitle(CSWizardMessages.SimpleCSCreationOperation_title);
-		simpleCS.setIntro(intro);
-		simpleCS.addItem(item);
-
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSFileWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSFileWizardPage.java
deleted file mode 100755
index fc4cf63..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSFileWizardPage.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.cheatsheet;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * SimpleCheatSheetFileWizardPage
- */
-public class SimpleCSFileWizardPage extends CSFileWizardPage {
-
-	public final static String F_PAGE_NAME = "simple-cheatsheet"; //$NON-NLS-1$
-
-	private String fAbsoluteFileName;
-
-	private String fProjectName;
-
-	/**
-	 * @param pageName
-	 * @param selection
-	 */
-	public SimpleCSFileWizardPage(IStructuredSelection selection) {
-		super(F_PAGE_NAME, selection);
-
-		// Initialize called by parent
-		fAbsoluteFileName = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.CheatSheetFileWizardPage#initialize()
-	 */
-	protected void initialize() {
-		setTitle(CSWizardMessages.SimpleCSFileWizardPage_title);
-		setDescription(CSWizardMessages.SimpleCSFileWizardPage_description);
-		// Force the file extension to be 'xml'
-		setFileExtension(F_FILE_EXTENSION);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.CheatSheetFileWizardPage#getCheatSheetType()
-	 */
-	public int getCheatSheetType() {
-		return F_SIMPLE_CHEAT_SHEET;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.CheatSheetFileWizardPage#createAdvancedControls(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createAdvancedControls(Composite parent) {
-		// NO-OP
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.cheatsheet.CheatSheetFileWizardPage#validatePage()
-	 */
-	protected boolean validatePage() {
-		// Set the absolute file name
-		fAbsoluteFileName = getContainerFullPath().toPortableString() + IPath.SEPARATOR + getFileName();
-		// Verify that the project name chosen by the user to store the simple
-		// cheat sheet is the same project name the composite cheat sheet is
-		// stored in
-		if (PDETextHelper.isDefined(fProjectName)) {
-			// Form: /<project-name>/<dir>/<dir>/<file>
-			String path = getContainerFullPath().toPortableString();
-			StringTokenizer tokenizer = new StringTokenizer(path, new Character(IPath.SEPARATOR).toString());
-			String compareProject = tokenizer.nextToken();
-			if (compareProject.equals(fProjectName) == false) {
-				setErrorMessage(NLS.bind(CSWizardMessages.SimpleCSFileWizardPage_errorMessage, fProjectName));
-				return false;
-			}
-		}
-
-		return super.validatePage();
-	}
-
-	/**
-	 * @return
-	 */
-	public String getAbsoluteFileName() {
-		// This is needed because the resource and group widget is disposed
-		// before the file name can be retrieved
-		return fAbsoluteFileName;
-	}
-
-	/**
-	 * @param projectName
-	 */
-	public void setProjectName(String projectName) {
-		fProjectName = projectName;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/messages.properties
deleted file mode 100644
index 02a7b6a..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/messages.properties
+++ /dev/null

@@ -1,39 +0,0 @@
-BaseCSCreationOperation_task=Creating cheat sheet ...
-CompCSCreationOperation_conclusion=Conclusion
-CompCSCreationOperation_group=Group
-CompCSCreationOperation_intro=Introduction
-CompCSCreationOperation_task=Task
-CompCSCreationOperation_title=Title
-CSFileWizardPage_compositeCheatSheet=&Composite Cheat Sheet
-CSFileWizardPage_compositeCheatSheetDesc=A composite cheat sheet guides users through a series of tasks represented by simple cheat sheets.
-CSFileWizardPage_description=Create a new simple cheat sheet or composite cheat sheet.
-CSFileWizardPage_group=Cheat Sheet Type
-CSFileWizardPage_simpleCheatSheet=&Simple Cheat Sheet
-CSFileWizardPage_simpleCheatSheetDesc=A simple cheat sheet guides users through a series of steps to achieve a task.
-CSFileWizardPage_title=Cheat Sheet
-NewCategoryNameDialog_labelDesc=Specify a name for the new category:
-NewCategoryNameDialog_labelText=&Name:
-NewCSFileWizard_title=New Cheat Sheet
-RegisterCSOperation_errorMessage=Operation aborted because manifest file is read-only
-RegisterCSOperation_errorMessage2=Operation aborted because manifest file is read-only
-RegisterCSOperation_task=Adding new cheat sheet extension to existing plug-in manifest file...
-RegisterCSOperation_task2=Modifying existing cheat sheet extension in existing plug-in manifest file...
-RegisterCSOperation_task3=Modifying existing cheat sheet element in existing plug-in manifest file...
-RegisterCSOperation_task4=Adding new cheat sheet extension to new plug-in manifest file...
-RegisterCSWizard_title=Register Cheat Sheet
-RegisterCSWizardPage_category=&Category:
-RegisterCSWizardPage_desc=&Description:
-RegisterCSWizardPage_description=Allow the cheat sheet to be accessed through the Help menu
-RegisterCSWizardPage_descTooltip=Create New Category
-RegisterCSWizardPage_group=Registration Information
-RegisterCSWizardPage_label=Optionally, specify the category and description to use when selecting the cheat sheet from a dialog:
-RegisterCSWizardPage_new=&New...
-RegisterCSWizardPage_newTooltip=Create a new category
-RegisterCSWizardPage_none=<none>
-RegisterCSWizardPage_title=Cheat Sheet
-SimpleCSCreationOperation_body=Body
-SimpleCSCreationOperation_item=Item
-SimpleCSCreationOperation_title=Title
-SimpleCSFileWizardPage_description=Create a new simple cheat sheet.
-SimpleCSFileWizardPage_errorMessage=The simple cheat sheet must be stored in project "{0}"
-SimpleCSFileWizardPage_title=Cheat Sheet

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/CtxWizardMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/CtxWizardMessages.java
deleted file mode 100644
index 650878b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/CtxWizardMessages.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.ctxhelp;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CtxWizardMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.wizards.ctxhelp.messages"; //$NON-NLS-1$
-	
-	public static String NewCtxHelpOperation_context;
-	public static String NewCtxHelpOperation_topic;
-	public static String NewCtxHelpWizard_title;
-	public static String NewCtxHelpWizardPage_description;
-	public static String NewCtxHelpWizardPage_title;
-	public static String RegisterCtxHelpOperation_errorMessage1;
-	public static String RegisterCtxHelpOperation_errorMessage2;
-	public static String RegisterCtxHelpOperation_task;
-	public static String RegisterCtxHelpWizard_pageMessage;
-	public static String RegisterCtxHelpWizard_pageTitle;
-	public static String RegisterCtxHelpWizard_plugin;
-	public static String RegisterCtxHelpWizard_pluginDesc;
-	public static String RegisterCtxHelpWizard_title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, CtxWizardMessages.class);
-	}
-
-	private CtxWizardMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java
deleted file mode 100644
index a887c94..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpOperation.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.ctxhelp;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpContext;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpModel;
-import org.eclipse.pde.internal.ua.core.ctxhelp.text.CtxHelpTopic;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-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.ISetSelectionTarget;
-
-/**
- * Operation to create a new context help xml file, add example entries and open it
- * in the context help editor.
- * @since 3.4
- */
-public class NewCtxHelpOperation extends WorkspaceModifyOperation {
-
-	private IFile fFile;
-
-	public NewCtxHelpOperation(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 {
-		CtxHelpModel model = new CtxHelpModel(CoreUtility.getTextDocument(fFile.getContents()), false);
-		model.setUnderlyingResource(fFile);
-		initializeModel(model);
-		model.save();
-		model.dispose();
-		openFile();
-		monitor.done();
-	}
-
-	/**
-	 * Initialize the xml with example entries
-	 * @param model model for the file
-	 */
-	private void initializeModel(CtxHelpModel model) {
-		CtxHelpContext context = model.getFactory().createContext();
-		context.setID(CtxWizardMessages.NewCtxHelpOperation_context);
-		model.getCtxHelpRoot().addChild(context);
-		CtxHelpTopic topic = model.getFactory().createTopic();
-		topic.setLabel(CtxWizardMessages.NewCtxHelpOperation_topic);
-		context.addChild(topic);
-	}
-
-	/**
-	 * Asynchronously opens the created file in the context help editor.
-	 */
-	protected void openFile() {
-		Display.getCurrent().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchWindow ww = PDEUserAssistanceUIPlugin.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 {
-					IDE.openEditor(page, fFile, IConstants.CONTEXT_HELP_EDITOR_ID);
-				} catch (PartInitException e) {
-				}
-			}
-		});
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizard.java
deleted file mode 100644
index d2bdbf6..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizard.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.ctxhelp;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard;
-
-/**
- * Wizard to create a new context help file.
- * @since 3.4
- */
-public class NewCtxHelpWizard extends BasicNewFileResourceWizard {
-
-	protected NewCtxHelpWizardPage fMainPage;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new NewCtxHelpWizardPage("new context help", getSelection()); //$NON-NLS-1$
-		addPage(fMainPage);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		super.init(workbench, currentSelection);
-		setWindowTitle(CtxWizardMessages.NewCtxHelpWizard_title);
-		setNeedsProgressMonitor(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#initializeDefaultPageImageDescriptor()
-	 */
-	protected void initializeDefaultPageImageDescriptor() {
-		// setDefaultPageImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_TARGET_WIZ);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			getContainer().run(false, true, getOperation());
-		} catch (InvocationTargetException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return the operation to execute on finish
-	 */
-	private IRunnableWithProgress getOperation() {
-		IFile file = fMainPage.createNewFile();
-		return new NewCtxHelpOperation(file);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizardPage.java
deleted file mode 100644
index fc4f87f..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/NewCtxHelpWizardPage.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.ctxhelp;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Wizard page to create a new context help xml file.
- * 
- * @since 3.4
- * @see NewCtxHelpWizard
- */
-public class NewCtxHelpWizardPage extends PDEWizardNewFileCreationPage {
-
-	private static String EXTENSION = "xml"; //$NON-NLS-1$
-
-	public NewCtxHelpWizardPage(String pageName, IStructuredSelection selection) {
-		super(pageName, selection);
-		setTitle(CtxWizardMessages.NewCtxHelpWizardPage_title);
-		setDescription(CtxWizardMessages.NewCtxHelpWizardPage_description);
-		// Force the file extension to be 'xml'
-		setFileExtension(EXTENSION);
-	}
-
-	protected void createAdvancedControls(Composite parent) {
-		// We don't want any advanced controls showing up
-	}
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_CTX_HLP_PAGE);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java
deleted file mode 100644
index 289e86b..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpOperation.java
+++ /dev/null

@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.ctxhelp;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.Status;
-import org.eclipse.pde.core.IBaseModel;
-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.*;
-import org.eclipse.pde.internal.core.ClasspathUtilCore;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.TargetPlatformHelper;
-import org.eclipse.pde.internal.core.build.BuildObject;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
-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.text.bundle.BundleSymbolicNameHeader;
-import org.eclipse.pde.internal.core.text.bundle.RequireBundleHeader;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.ctxhelp.ICtxHelpConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpEditor;
-import org.eclipse.pde.internal.ui.util.ModelModification;
-import org.eclipse.pde.internal.ui.util.PDEModelUtility;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.osgi.framework.Constants;
-
-/**
- * Register Context Help Operation, registers a context help xml file in the
- * plugin.xml. Must be run in the UI thread.
- * 
- * @since 3.4
- * @see RegisterCtxHelpOperation
- * @see CtxHelpEditor
- */
-public class RegisterCtxHelpOperation extends WorkspaceModifyOperation {
-
-	static final String CTX_HELP_EXTENSION_POINT_ID = "org.eclipse.help.contexts"; //$NON-NLS-1$
-	static final String CTX_HELP_PLUGIN_ID = "org.eclipse.help"; //$NON-NLS-1$
-
-	public static final String CTX_HELP_ATTR_FILE = "file"; //$NON-NLS-1$
-	public final static String CTX_HELP_ATTR_PLUGIN = "plugin"; //$NON-NLS-1$
-
-	private Shell fShell;
-	private String fPluginText;
-	private IProject fProject;
-	private String fResourceString;
-
-	public RegisterCtxHelpOperation(Shell shell, IModel model, String pluginText) {
-		fPluginText = pluginText;
-		fProject = model.getUnderlyingResource().getProject();
-		fResourceString = model.getUnderlyingResource()
-				.getProjectRelativePath().toPortableString();
-		fShell = shell;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core
-	 * .runtime.IProgressMonitor)
-	 */
-	protected void execute(IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException {
-		try {
-			boolean fragment = PluginRegistry.findModel(fProject)
-					.isFragmentModel();
-			IFile file = fProject
-					.getFile(fragment ? ICoreConstants.FRAGMENT_PATH
-							: ICoreConstants.PLUGIN_PATH);
-			// If the plug-in exists modify it accordingly; otherwise, create
-			// a new plug-in file
-			if (file.exists()) {
-				modifyExistingPluginFile(file, monitor);
-			} else {
-				createNewPluginFile(file, monitor);
-			}
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	private void modifyExistingPluginFile(IFile file, IProgressMonitor monitor)
-			throws CoreException {
-		IStatus status = ResourcesPlugin.getWorkspace().validateEdit(
-				new IFile[] { file }, fShell);
-		if (status.getSeverity() != IStatus.OK) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.ERROR,
-					CtxWizardMessages.RegisterCtxHelpOperation_errorMessage1,
-					null));
-		}
-		// Perform the modification of the plugin manifest file
-		ModelModification mod = new ModelModification(fProject) {
-			protected void modifyModel(IBaseModel model,
-					IProgressMonitor monitor) throws CoreException {
-				doModifyPluginModel(model, monitor);
-				doModifyManifestModel(model);
-			}
-		};
-		PDEModelUtility.modifyModel(mod, monitor);
-	}
-
-	private void doModifyPluginModel(IBaseModel model, IProgressMonitor monitor)
-			throws CoreException {
-		if ((model instanceof IPluginModelBase) == false) {
-			return;
-		}
-
-		IPluginModelBase modelBase = (IPluginModelBase) model;
-		IPluginExtension[] extensions = modelBase.getExtensions()
-				.getExtensions();
-		IPluginExtension existingExtension = null;
-		for (int i = 0; i < extensions.length; i++) {
-			String point = extensions[i].getPoint();
-			if (CTX_HELP_EXTENSION_POINT_ID.equals(point)) {
-				if (checkExistingExtensionElement(extensions[i])) {
-					// Exact match, no need to register anything
-					return;
-				}
-				existingExtension = extensions[i];
-			}
-		}
-
-		if (existingExtension != null) {
-			// No exact match, add a new entry to the existing extension
-			addElementToExtension(existingExtension);
-		} else {
-			// No existing extension found, create one
-			addExtensionToModel(modelBase);
-		}
-	}
-
-	private void doModifyManifestModel(IBaseModel model) {
-		// Make sure we have a base model
-		if ((model instanceof IBundlePluginModelBase) == false) {
-			return;
-		}
-		IBundlePluginModelBase modelBase = (IBundlePluginModelBase) model;
-		IBundle bundle = modelBase.getBundleModel().getBundle();
-		// Get the heading specifying the singleton declaration
-		IManifestHeader header = bundle
-				.getManifestHeader(Constants.BUNDLE_SYMBOLICNAME);
-		if (header instanceof BundleSymbolicNameHeader) {
-			BundleSymbolicNameHeader symbolic = (BundleSymbolicNameHeader) header;
-			// If the singleton declaration is false, change it to true
-			// This is required because plug-ins that specify extensions
-			// must be singletons.
-			if (symbolic.isSingleton() == false) {
-				symbolic.setSingleton(true);
-			}
-		}
-		// Add the context help plug-in to the list of required bundles
-		header = bundle.getManifestHeader(Constants.REQUIRE_BUNDLE);
-		if (header instanceof RequireBundleHeader) {
-			RequireBundleHeader require = (RequireBundleHeader) header;
-			if (require.hasElement(CTX_HELP_PLUGIN_ID) == false) {
-				require.addBundle(CTX_HELP_PLUGIN_ID);
-			}
-		}
-	}
-
-	private void createNewPluginFile(IFile file, IProgressMonitor monitor)
-			throws CoreException {
-		monitor.beginTask(CtxWizardMessages.RegisterCtxHelpOperation_task, 4);
-
-		WorkspacePluginModelBase model;
-		if (file.getProjectRelativePath().equals(ICoreConstants.FRAGMENT_PATH)) {
-			model = new WorkspaceFragmentModel(file, false);
-		} else {
-			model = new WorkspacePluginModel(file, false);
-		}
-		monitor.worked(1);
-
-		IPluginBase base = model.getPluginBase();
-		base.setSchemaVersion(TargetPlatformHelper.getSchemaVersion());
-
-		addExtensionToModel(model);
-		monitor.worked(1);
-
-		model.save();
-		monitor.worked(1);
-		// Update the MANIFEST.MF file to ensure the singleton directive is set
-		// to true
-		modifyExistingManifestFile(file);
-		monitor.done();
-	}
-
-	/**
-	 * @param model
-	 */
-	private void modifyExistingManifestFile(IFile file) throws CoreException {
-		// Validate the operation
-		// Note: This is not accurate, we are validating the plugin.xml file
-		// rather
-		// than the manifest file
-		IStatus status = ResourcesPlugin.getWorkspace().validateEdit(
-				new IFile[] { file }, fShell);
-		if (status.getSeverity() != IStatus.OK) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.ERROR,
-					CtxWizardMessages.RegisterCtxHelpOperation_errorMessage2,
-					null));
-		}
-		// Perform the modification of the manifest file
-		ModelModification mod = new ModelModification(fProject) {
-			protected void modifyModel(IBaseModel model,
-					IProgressMonitor monitor) throws CoreException {
-				doModifyManifestModel(model);
-				doModifyBuildModel(model);
-			}
-		};
-		PDEModelUtility.modifyModel(mod, null);
-	}
-
-	private void doModifyBuildModel(IBaseModel model) throws CoreException {
-		// Make sure we have a base model
-		if ((model instanceof IPluginModelBase) == false) {
-			return;
-		}
-		IPluginModelBase modelBase = (IPluginModelBase) model;
-		IBuild build = ClasspathUtilCore.getBuild(modelBase);
-		// Make sure we have a plugin.properties file
-		if (build == null) {
-			return;
-		}
-		// Get the entry for bin.includes
-		IBuildEntry entry = build.getEntry(IBuildEntry.BIN_INCLUDES);
-		if (entry == null) {
-			// This should never happen since the manifest.mf file exists and
-			// it has to be in the bin.includes
-			return;
-		}
-		// Add the plugin.xml file to the bin.includes build entry if it does
-		// not exist
-		if (entry.contains(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) == false) {
-			entry.addToken(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
-		}
-		// There does not seem to be any support in PDEModelUtility or the
-		// ModelModification framework to save build.properties modifications
-		// As a result, explicitly do that here
-		if (build instanceof BuildObject) {
-			IBuildModel buildModel = ((BuildObject) build).getModel();
-			if (buildModel instanceof WorkspaceBuildModel) {
-				((WorkspaceBuildModel) buildModel).save();
-			}
-		}
-	}
-
-	private boolean checkExistingExtensionElement(IPluginExtension extension) {
-		IPluginObject[] pluginObjects = extension.getChildren();
-		for (int j = 0; j < pluginObjects.length; j++) {
-			if (pluginObjects[j] instanceof IPluginElement) {
-				IPluginElement element = (IPluginElement) pluginObjects[j];
-				if (element.getName().equals(ICtxHelpConstants.ELEMENT_ROOT)) {
-					IPluginAttribute fileAttribute = element
-							.getAttribute(CTX_HELP_ATTR_FILE);
-					if ((fileAttribute != null)
-							&& PDETextHelper
-									.isDefined(fileAttribute.getValue())
-							&& fResourceString.equals(fileAttribute.getValue())) {
-						IPluginAttribute pluginAttribute = element
-								.getAttribute(CTX_HELP_ATTR_PLUGIN);
-						if (pluginAttribute == null
-								|| !PDETextHelper.isDefined(pluginAttribute
-										.getValue())) {
-							if (fPluginText.length() == 0) {
-								return true;
-							}
-						} else if (fPluginText.equals(pluginAttribute
-								.getValue())) {
-							return true;
-						}
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	private void addExtensionToModel(IPluginModelBase model)
-			throws CoreException {
-		IPluginExtension extension = model.getFactory().createExtension();
-		extension.setPoint(CTX_HELP_EXTENSION_POINT_ID);
-		addElementToExtension(extension);
-		model.getPluginBase().add(extension);
-	}
-
-	private void addElementToExtension(IPluginExtension extension)
-			throws CoreException {
-		IPluginElement element = extension.getModel().getFactory()
-				.createElement(extension);
-		element.setName(ICtxHelpConstants.ELEMENT_ROOT);
-		element.setAttribute(CTX_HELP_ATTR_FILE, fResourceString);
-		if (fPluginText.length() > 0) {
-			element.setAttribute(CTX_HELP_ATTR_PLUGIN, fPluginText);
-		}
-		extension.add(element);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java
deleted file mode 100644
index c753d7c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/RegisterCtxHelpWizard.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.ctxhelp;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.pde.internal.ua.ui.editor.ctxhelp.CtxHelpEditor;
-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.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Wizard to register a context help file in plugin.xml
- * @since 3.4
- * @see RegisterCtxHelpOperation
- * @see CtxHelpEditor
- */
-public class RegisterCtxHelpWizard extends Wizard {
-
-	private RegisterCtxHelpWizardPage fMainPage;
-	private IModel fWizModel;
-
-	public RegisterCtxHelpWizard(IModel model) {
-		fWizModel = model;
-		setWindowTitle(CtxWizardMessages.RegisterCtxHelpWizard_title);
-		setDefaultPageImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_CHEATSHEET_WIZ);
-		setNeedsProgressMonitor(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new RegisterCtxHelpWizardPage(CtxWizardMessages.RegisterCtxHelpWizard_title);
-		addPage(fMainPage);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			getContainer().run(false, true, new RegisterCtxHelpOperation(getShell(), fWizModel, fMainPage.getPluginText()));
-		} catch (InvocationTargetException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Main page of the wizard
-	 * @since 3.4
-	 */
-	class RegisterCtxHelpWizardPage extends WizardPage {
-
-		private Text fPluginText;
-
-		protected RegisterCtxHelpWizardPage(String pageName) {
-			super(pageName);
-			setTitle(CtxWizardMessages.RegisterCtxHelpWizard_pageTitle);
-			setMessage(CtxWizardMessages.RegisterCtxHelpWizard_pageMessage);
-		}
-
-		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			composite.setLayout(new GridLayout(2, false));
-			composite.setFont(parent.getFont());
-			composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			Label label = new Label(composite, SWT.NONE);
-			label.setFont(composite.getFont());
-			label.setLayoutData(new GridData());
-			label.setText(CtxWizardMessages.RegisterCtxHelpWizard_plugin);
-
-			fPluginText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-			fPluginText.setFont(composite.getFont());
-			fPluginText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-			Label label2 = new Label(composite, SWT.NONE);
-			label2.setFont(composite.getFont());
-			GridData data = new GridData();
-			data.horizontalSpan = 2;
-			label2.setLayoutData(data);
-			label2.setText(CtxWizardMessages.RegisterCtxHelpWizard_pluginDesc);
-
-			setControl(composite);
-		}
-
-		public String getPluginText() {
-			return fPluginText.getText().trim();
-		}
-
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/messages.properties
deleted file mode 100644
index 677d18c..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/ctxhelp/messages.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-NewCtxHelpOperation_context=Context
-NewCtxHelpOperation_topic=Topic
-NewCtxHelpWizard_title=New Context Help
-NewCtxHelpWizardPage_description=Create a new context help file.
-NewCtxHelpWizardPage_title=Context Help
-RegisterCtxHelpOperation_errorMessage1=Operation aborted because manifest file is read-only
-RegisterCtxHelpOperation_errorMessage2=Operation aborted because manifest file is read-only
-RegisterCtxHelpOperation_task=Adding new cheat sheet extension to new plug-in manifest file...
-RegisterCtxHelpWizard_pageMessage=Enter any additional information and hit finish to register the file in plugin.xml
-RegisterCtxHelpWizard_pageTitle=Context Help
-RegisterCtxHelpWizard_plugin=&Plugin:
-RegisterCtxHelpWizard_pluginDesc=You can optionally specify a plug-in that this context help file extends.
-RegisterCtxHelpWizard_title=Register Context Help File

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/IRegisterTOCData.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/IRegisterTOCData.java
deleted file mode 100644
index 0a97ace..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/IRegisterTOCData.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import org.eclipse.core.resources.IProject;
-
-public interface IRegisterTOCData {
-
-	/**
-	 * @return
-	 */
-	public boolean getDataPrimary();
-
-	/**
-	 * @return
-	 */
-	public String getDataTocFile();
-
-	/**
-	 * @return
-	 */
-	public IProject getPluginProject();
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java
deleted file mode 100755
index 86ba1d4..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.ui.IWorkbench;
-
-public class NewTocFileWizard extends TocHTMLWizard {
-
-	private TocWizardPage fPage;
-	private IPath fInitialPath = null;
-
-	public void addPages() {
-		fPage = new TocWizardPage("tocfile", getSelection()); //$NON-NLS-1$
-		if (fInitialPath != null)
-			fPage.setContainerFullPath(fInitialPath);
-		addPage(fPage);
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		super.init(workbench, currentSelection);
-		setWindowTitle(TocWizardMessages.NewTocFileWizard_title);
-		setNeedsProgressMonitor(true);
-	}
-
-	protected void initializeDefaultPageImageDescriptor() {
-		// setDefaultPageImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_TARGET_WIZ);
-	}
-
-	public boolean performFinish() {
-		try {
-			fNewFile = fPage.createNewFile();
-			getContainer().run(false, true, getOperation());
-		} catch (InvocationTargetException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			fNewFile = null;
-			return false;
-		} catch (InterruptedException e) {
-			fNewFile = null;
-			return false;
-		}
-		return true;
-	}
-
-	private TocOperation getOperation() {
-		return new TocOperation(fPage.createNewFile(), fPage.getTocName());
-	}
-
-	public void setInitialPath(IPath path) {
-		fInitialPath = path;
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java
deleted file mode 100644
index 6cdc7d9..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocOperation.java
+++ /dev/null

@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.pde.core.IBaseModel;
-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.*;
-import org.eclipse.pde.internal.core.ClasspathUtilCore;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.TargetPlatformHelper;
-import org.eclipse.pde.internal.core.build.BuildObject;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
-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.text.bundle.BundleSymbolicNameHeader;
-import org.eclipse.pde.internal.core.text.bundle.RequireBundleHeader;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ua.core.toc.ITocConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ui.util.ModelModification;
-import org.eclipse.pde.internal.ui.util.PDEModelUtility;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.osgi.framework.Constants;
-
-public class RegisterTocOperation extends WorkspaceModifyOperation {
-
-	public final static String F_TOC_EXTENSION_POINT_ID = "org.eclipse.help.toc"; //$NON-NLS-1$
-	public static final String F_HELP_EXTENSION_ID = "org.eclipse.help"; //$NON-NLS-1$
-	public static final String F_TOC_ATTRIBUTE_FILE = "file"; //$NON-NLS-1$
-	public final static String F_TOC_ATTRIBUTE_PRIMARY = "primary"; //$NON-NLS-1$
-	public final static String F_TOC_ATTRIBUTE_EXTRADIR = "extradir"; //$NON-NLS-1$
-	public final static String F_TOC_ATTRIBUTE_CATEGORY = "category"; //$NON-NLS-1$
-
-	private IRegisterTOCData fPage;
-	private Shell fShell;
-
-	/**
-	 * 
-	 */
-	public RegisterTocOperation(IRegisterTOCData page, Shell shell) {
-		fPage = page;
-		fShell = shell;
-	}
-
-	/**
-	 * @param rule
-	 */
-	public RegisterTocOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
-		try {
-			boolean fragment = PluginRegistry.findModel(fPage.getPluginProject()).isFragmentModel();
-			IFile file = fPage.getPluginProject().getFile(fragment ? ICoreConstants.FRAGMENT_PATH : ICoreConstants.PLUGIN_PATH);
-			// If the plug-in exists modify it accordingly; otherwise, create
-			// a new plug-in file
-			if (file.exists()) {
-				modifyExistingPluginFile(file, monitor);
-			} else {
-				createNewPluginFile(file, monitor);
-			}
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	/**
-	 * FindCSExtensionResult
-	 *
-	 */
-	private static class FindTocExtensionResult {
-
-		public IPluginExtension fTocExtension;
-
-		public IPluginElement fTocElement;
-
-		/**
-		 * 
-		 */
-		public FindTocExtensionResult() {
-			fTocExtension = null;
-			fTocElement = null;
-		}
-
-		/**
-		 * @return
-		 */
-		public boolean foundTocExtension() {
-			return (fTocExtension != null);
-		}
-
-		/**
-		 * @return
-		 */
-		public boolean foundExactTocElement() {
-			return (fTocElement != null);
-		}
-	}
-
-	/**
-	 * @param file
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	private void modifyExistingPluginFile(IFile file, IProgressMonitor monitor) throws CoreException {
-
-		// Validate the operation
-		// Note: This is not accurate, we are validating the plugin.xml file 
-		// but not the manifest.mf file
-		IStatus status = ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {file}, fShell);
-		if (status.getSeverity() != IStatus.OK) {
-			throw new CoreException(new Status(IStatus.ERROR, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.ERROR, TocWizardMessages.RegisterTocOperation_errorMessage1, null));
-		}
-		// Perform the modification of the plugin manifest file
-		ModelModification mod = new ModelModification(fPage.getPluginProject()) {
-			protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
-				doModifyPluginModel(model, monitor);
-				doModifyManifestModel(model);
-			}
-		};
-		PDEModelUtility.modifyModel(mod, monitor);
-	}
-
-	/**
-	 * @param model
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	private void doModifyPluginModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
-		if ((model instanceof IPluginModelBase) == false) {
-			return;
-		}
-		IPluginModelBase modelBase = (IPluginModelBase) model;
-		// Find an existing cheat sheet extension 
-		FindTocExtensionResult result = findTocExtensionResult(modelBase);
-		// Check search results and act accordingly
-		if (result.foundTocExtension() && result.foundExactTocElement()) {
-			// An exact match to an existing TOC element was
-			// found.  Update the element fields
-			modifyExistingElement(result.fTocElement, monitor);
-		} else if (result.foundTocExtension()) {
-			// No exact match to an existing TOC element found within
-			// the existing TOC extension.  Update the 
-			// existing extension by adding a new TOC element
-			// to it
-			modifyExistingExtension(result.fTocExtension, monitor);
-		} else {
-			// No existing TOC extension found, create a new
-			// extension
-			insertNewExtension(modelBase, monitor);
-		}
-	}
-
-	/**
-	 * @param modelBase
-	 */
-	private void insertNewExtension(IPluginModelBase modelBase, IProgressMonitor monitor) throws CoreException {
-		// Update progress work units
-		monitor.beginTask(TocWizardMessages.RegisterTocOperation_task, 1);
-		// Create the new extension
-		IPluginExtension extension = createExtensionToc(modelBase);
-		modelBase.getPluginBase().add(extension);
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param extension
-	 */
-	private void modifyExistingExtension(IPluginExtension extension, IProgressMonitor monitor) throws CoreException {
-		// Update progress work units
-		monitor.beginTask(TocWizardMessages.RegisterTocOperation_task2, 1);
-		// Create new children for existing extension
-		createExtensionChildren(extension);
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param tocElement
-	 * @param monitor
-	 */
-	private void modifyExistingElement(IPluginElement tocElement, IProgressMonitor monitor) throws CoreException {
-		// Update progress work units
-		monitor.beginTask(TocWizardMessages.RegisterTocOperation_task3, 1);
-
-		// Update the file
-		tocElement.setAttribute(F_TOC_ATTRIBUTE_FILE, fPage.getDataTocFile());
-
-		// Update the primary attribute
-		// But only if it already exists, or if this TOC will be primary
-		boolean primary = fPage.getDataPrimary();
-		if (primary || tocElement.getAttribute(F_TOC_ATTRIBUTE_PRIMARY) != null) {
-			tocElement.setAttribute(F_TOC_ATTRIBUTE_PRIMARY, Boolean.toString(primary));
-		}
-
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param model
-	 * @param extensionResult cheat sheet extension found or null
-	 * @param elementResult cheat sheet element found or null
-	 * @return
-	 */
-	private FindTocExtensionResult findTocExtensionResult(IPluginModelBase model) {
-		// Container for result
-		FindTocExtensionResult result = new FindTocExtensionResult();
-		// Find all cheat sheet extensions within the host plug-in
-		IPluginExtension[] extensions = findTOCExtensions(model);
-		// Process all TOC extensions
-		// Extension search results
-		// (1) An existing extension containing a TOC element with the 
-		//     exact TOC filename
-		// (2) An existing extension (last one found) containing 0 or more 
-		//     TOC elements
-		// (3) No existing extension
-		for (int i = 0; i < extensions.length; i++) {
-			// TOC extension match found
-			result.fTocExtension = extensions[i];
-			// Check for children
-			if (extensions[i].getChildCount() == 0) {
-				// Extension has no children, skip to the next extension
-				continue;
-			}
-
-			IPluginObject[] pluginObjects = extensions[i].getChildren();
-			// Process all children
-			for (int j = 0; j < pluginObjects.length; j++) {
-				if (pluginObjects[j] instanceof IPluginElement) {
-					IPluginElement element = (IPluginElement) pluginObjects[j];
-					// Find TOC elements
-					if (element.getName().equals(ITocConstants.ELEMENT_TOC)) {
-						// TOC element
-						// Get the file attribute
-						IPluginAttribute fileAttribute = element.getAttribute(F_TOC_ATTRIBUTE_FILE);
-						// Check for the filename for this TOC element
-						if ((fileAttribute != null) && PDETextHelper.isDefined(fileAttribute.getValue()) && fPage.getDataTocFile().equals(fileAttribute.getValue())) {
-							// Matching TOC element found
-							result.fTocElement = element;
-							return result;
-						}
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	public static IPluginExtension[] findTOCExtensions(ISharedExtensionsModel model) {
-		IPluginExtension[] extensions = model.getExtensions().getExtensions();
-
-		ArrayList tocExtensions = new ArrayList();
-		for (int i = 0; i < extensions.length; i++) {
-			String point = extensions[i].getPoint();
-			if (F_TOC_EXTENSION_POINT_ID.equals(point)) {
-				tocExtensions.add(extensions[i]);
-			}
-		}
-		return (IPluginExtension[]) tocExtensions.toArray(new IPluginExtension[tocExtensions.size()]);
-	}
-
-	/**
-	 * @param file
-	 * @param monitor
-	 */
-	private void createNewPluginFile(IFile file, IProgressMonitor monitor) throws CoreException {
-
-		// Update progress work units
-		monitor.beginTask(TocWizardMessages.RegisterTocOperation_task4, 4);
-		// Create the plug-in model
-		WorkspacePluginModelBase model = (WorkspacePluginModelBase) createModel(file);
-		// Update progress work units
-		monitor.worked(1);
-
-		IPluginBase base = model.getPluginBase();
-		base.setSchemaVersion(TargetPlatformHelper.getSchemaVersion());
-		// Create the cheat sheet extension
-		base.add(createExtensionToc(model));
-		// Update progress work units
-		monitor.worked(1);
-		// Save the model to file
-		model.save();
-		// Update progress work units
-		monitor.worked(1);
-		// Update the MANIFEST.MF file to ensure the singleton directive is set
-		// to true
-		modifyExistingManifestFile(file);
-		// Update progress work units
-		monitor.done();
-	}
-
-	/**
-	 * @param model
-	 */
-	private void modifyExistingManifestFile(IFile file) throws CoreException {
-		// Validate the operation
-		// Note: This is not accurate, we are validating the plugin.xml file rather
-		// than the manifest file
-		IStatus status = ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {file}, fShell);
-		if (status.getSeverity() != IStatus.OK) {
-			throw new CoreException(new Status(IStatus.ERROR, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.ERROR, TocWizardMessages.RegisterTocOperation_errorMessage2, null));
-		}
-		// Perform the modification of the manifest file
-		ModelModification mod = new ModelModification(fPage.getPluginProject()) {
-			protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
-				doModifyManifestModel(model);
-				doModifyBuildModel(model);
-			}
-		};
-		PDEModelUtility.modifyModel(mod, null);
-	}
-
-	/**
-	 * @param model
-	 */
-	private void doModifyManifestModel(IBaseModel model) {
-		// Make sure we have a base model
-		if ((model instanceof IBundlePluginModelBase) == false) {
-			return;
-		}
-		IBundlePluginModelBase modelBase = (IBundlePluginModelBase) model;
-		IBundle bundle = modelBase.getBundleModel().getBundle();
-		// Get the heading specifying the singleton declaration 
-		IManifestHeader header = bundle.getManifestHeader(Constants.BUNDLE_SYMBOLICNAME);
-		if (header instanceof BundleSymbolicNameHeader) {
-			BundleSymbolicNameHeader symbolic = (BundleSymbolicNameHeader) header;
-			// If the singleton declaration is false, change it to true
-			// This is required because plug-ins that specify extensions
-			// must be singletons.
-			if (symbolic.isSingleton() == false) {
-				symbolic.setSingleton(true);
-			}
-		}
-		// Add the cheat sheets plug-in to the list of required bundles
-		header = bundle.getManifestHeader(Constants.REQUIRE_BUNDLE);
-		if (header instanceof RequireBundleHeader) {
-			RequireBundleHeader require = (RequireBundleHeader) header;
-			if (require.hasElement(F_HELP_EXTENSION_ID) == false) {
-				require.addBundle(F_HELP_EXTENSION_ID);
-			}
-		}
-	}
-
-	/**
-	 * @param model
-	 */
-	private void doModifyBuildModel(IBaseModel model) throws CoreException {
-		// Make sure we have a base model
-		if ((model instanceof IPluginModelBase) == false) {
-			return;
-		}
-		IPluginModelBase modelBase = (IPluginModelBase) model;
-		IBuild build = ClasspathUtilCore.getBuild(modelBase);
-		// Make sure we have a plugin.properties file
-		if (build == null) {
-			return;
-		}
-		// Get the entry for bin.includes
-		IBuildEntry entry = build.getEntry(IBuildEntry.BIN_INCLUDES);
-		if (entry == null) {
-			// This should never happen since the manifest.mf file exists and
-			// it has to be in the bin.includes
-			return;
-		}
-		// Add the plugin.xml file to the bin.includes build entry if it does
-		// not exist
-		if (entry.contains(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) == false) {
-			entry.addToken(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
-		}
-		// There does not seem to be any support in PDEModelUtility or the 
-		// ModelModification framework to save build.properties modifications
-		// As a result, explicitly do that here
-		if (build instanceof BuildObject) {
-			IBuildModel buildModel = ((BuildObject) build).getModel();
-			if (buildModel instanceof WorkspaceBuildModel) {
-				((WorkspaceBuildModel) buildModel).save();
-			}
-		}
-	}
-
-	/**
-	 * @param file
-	 * @return
-	 */
-	private IPluginModelBase createModel(IFile file) {
-		if (file.getProjectRelativePath().equals(ICoreConstants.FRAGMENT_PATH)) {
-			return new WorkspaceFragmentModel(file, false);
-		}
-		return new WorkspacePluginModel(file, false);
-	}
-
-	/**
-	 * @param model
-	 * @return
-	 * @throws CoreException
-	 */
-	private IPluginExtension createExtensionToc(IPluginModelBase model) throws CoreException {
-		IPluginExtension extension = model.getFactory().createExtension();
-		// Point
-		extension.setPoint(F_TOC_EXTENSION_POINT_ID);
-
-		createExtensionChildren(extension);
-
-		return extension;
-	}
-
-	/**
-	 * @param extension
-	 * @throws CoreException
-	 */
-	private void createExtensionChildren(IPluginExtension extension) throws CoreException {
-		// TOC element
-		IPluginElement tocElement = createElementToc(extension);
-		if (tocElement != null) {
-			extension.add(tocElement);
-		}
-	}
-
-	/**
-	 * @param extension
-	 * @return
-	 * @throws CoreException
-	 */
-	private IPluginElement createElementToc(IPluginExtension extension) throws CoreException {
-
-		IPluginElement element = extension.getModel().getFactory().createElement(extension);
-
-		// Element: toc
-		element.setName(ITocConstants.ELEMENT_TOC);
-
-		// Attribute: file
-		element.setAttribute(F_TOC_ATTRIBUTE_FILE, fPage.getDataTocFile());
-
-		// Attribute: primary
-		boolean primary = fPage.getDataPrimary();
-
-		if (primary) {
-			element.setAttribute(F_TOC_ATTRIBUTE_PRIMARY, Boolean.TRUE.toString());
-		} else {
-			element.setAttribute(F_TOC_ATTRIBUTE_PRIMARY, Boolean.FALSE.toString());
-		}
-
-		return element;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
deleted file mode 100644
index 9672b7d..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizard.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPluginImages;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * NewRegisterCSWizard
- */
-public class RegisterTocWizard extends Wizard implements INewWizard {
-
-	private RegisterTocWizardPage fMainPage;
-
-	private IModel fModel;
-
-	/**
-	 * 
-	 */
-	public RegisterTocWizard(IModel model) {
-		fModel = model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new RegisterTocWizardPage(fModel);
-		addPage(fMainPage);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			getContainer().run(false, true, getOperation());
-		} catch (InvocationTargetException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return
-	 */
-	private IRunnableWithProgress getOperation() {
-		return new RegisterTocOperation(fMainPage, getShell());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(TocWizardMessages.RegisterTocWizard_link);
-		// TODO: MP: LOW: TOC: New register table of contents wizard image
-		setDefaultPageImageDescriptor(PDEUserAssistanceUIPluginImages.DESC_CHEATSHEET_WIZ);
-		setNeedsProgressMonitor(true);
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java
deleted file mode 100644
index 695d3fa..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/RegisterTocWizardPage.java
+++ /dev/null

@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.util.PDETextHelper;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-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.PlatformUI;
-
-/**
- * RegisterTocWizardPage
- */
-public class RegisterTocWizardPage extends WizardPage implements IRegisterTOCData {
-
-	public static final int NUM_COLUMNS = 2;
-
-	public final static String F_PAGE_NAME = "register-toc"; //$NON-NLS-1$	
-
-	public final static String F_TOC_ELEMENT_TOC = "toc"; //$NON-NLS-1$
-
-	private Button fPrimaryChkBox;
-
-	protected IModel fTocModel;
-
-	private ISharedExtensionsModel fExtensionsModel;
-
-	private IProject fPluginProject;
-
-	private boolean fDataIsPrimary;
-
-	/**
-	 * @param pageName
-	 */
-	public RegisterTocWizardPage(IModel model) {
-		super(F_PAGE_NAME);
-
-		fTocModel = model;
-		initialize();
-	}
-
-	/**
-	 * 
-	 */
-	private void initialize() {
-
-		setTitle(TocWizardMessages.RegisterTocWizardPage_title);
-		setDescription(TocWizardMessages.RegisterTocWizardPage_description);
-
-		fPrimaryChkBox = null;
-
-		fDataIsPrimary = true;
-
-		// Get the project the TOC is stored in
-		fPluginProject = fTocModel.getUnderlyingResource().getProject();
-
-		initializePluginModel();
-	}
-
-	/**
-	 * 
-	 */
-	private void initializePluginModel() {
-		IPluginModelBase base = PluginRegistry.findModel(getPluginProject());
-
-		if (base == null)
-			return;
-		if (base instanceof IBundlePluginModelBase)
-			fExtensionsModel = ((IBundlePluginModelBase) base).getExtensionsModel();
-		else
-			fExtensionsModel = base;
-	}
-
-	/**
-	 * 
-	 */
-	private void updateUI() {
-
-		if (fExtensionsModel != null) {
-			// Find all TOC extensions within the host plug-in
-			IPluginExtension[] extensions = RegisterTocOperation.findTOCExtensions(fExtensionsModel);
-
-			// Process all TOC elements
-			processTocElements(extensions);
-		}
-	}
-
-	/**
-	 * @param extensions
-	 */
-	private void processTocElements(IPluginExtension[] extensions) {
-		// Query cheat sheet extensions for information required to update
-		// the description text and category combo widgets
-		// Linear search:  Process all cheat sheet extensions found
-		for (int i = 0; i < extensions.length; i++) {
-			if (extensions[i].getChildCount() == 0) {
-				// Extension has no children, skip to the next extension
-				continue;
-			}
-			IPluginExtension extension = extensions[i];
-			IPluginObject[] pluginObjects = extension.getChildren();
-			// Process all children
-			for (int j = 0; j < pluginObjects.length; j++) {
-				if (pluginObjects[j] instanceof IPluginElement) {
-					IPluginElement element = (IPluginElement) pluginObjects[j];
-					if (element.getName().equals(F_TOC_ELEMENT_TOC)) {
-						// TOC element
-						processTocElement(element, getDataTocFile());
-					}
-
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param extensions
-	 */
-	private void processTocElement(IPluginElement parentElement, String generatedID) {
-		// Get the id attribute
-		IPluginAttribute fileAttribute = parentElement.getAttribute(RegisterTocOperation.F_TOC_ATTRIBUTE_FILE);
-
-		// Check for the generated ID for this TOC
-		// If a TOC exists with the generated ID already, read its
-		// description and populate the description text accordingly		
-		if ((fileAttribute != null) && PDETextHelper.isDefined(fileAttribute.getValue()) && generatedID.equals(fileAttribute.getValue())) {
-			// Matching TOC extension found
-			// Process children if any
-			if (parentElement.getChildCount() > 0) {
-				// Update the description text widget
-				updateUIPrimary(parentElement);
-			}
-		}
-	}
-
-	private void updateUIPrimary(IPluginElement parentElement) {
-		IPluginObject pluginObject = parentElement.getChildren()[0];
-		if (pluginObject instanceof IPluginElement) {
-			IPluginElement element = (IPluginElement) pluginObject;
-			if (element.getName().equals(RegisterTocOperation.F_TOC_ATTRIBUTE_PRIMARY) && PDETextHelper.isDefinedAfterTrim(element.getText())) {
-				// Triggers listener to update data description on load
-				fPrimaryChkBox.setSelection(Boolean.getBoolean(element.getText().trim()));
-			}
-		}
-	}
-
-	public boolean getDataPrimary() {
-		return fDataIsPrimary;
-	}
-
-	public String getDataTocFile() {
-		return fTocModel.getUnderlyingResource().getProjectRelativePath().toPortableString();
-	}
-
-	public IProject getPluginProject() {
-		return fPluginProject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		createUI(parent);
-		createUIListeners();
-
-		updateUI();
-		validateUI();
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createUI(Composite parent) {
-		// Create the container
-		Composite container = createUIContainer(parent);
-
-		// Create the primary checkbox
-		createUIPrimaryChkBox(container);
-
-		// Set the control for the reciever
-		// Must be done otherwise a null assertion error is generated
-		setControl(container);
-		// Apply the dialog font to all controls using the default font
-		Dialog.applyDialogFont(container);
-		// Provide functionality for the help button
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.REGISTER_TOC);
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	private Composite createUIContainer(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = NUM_COLUMNS;
-		container.setLayout(layout);
-		return container;
-	}
-
-	private void createUIPrimaryChkBox(Composite parent) {
-		fPrimaryChkBox = new Button(parent, SWT.CHECK);
-		fPrimaryChkBox.setText(TocWizardMessages.RegisterTocWizardPage_makePrimary);
-		GridData data = new GridData();
-		data.horizontalSpan = NUM_COLUMNS;
-		fPrimaryChkBox.setLayoutData(data);
-		fPrimaryChkBox.setSelection(true);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListeners() {
-		// Create listeners for the primary check box
-		createUIListenersPrimaryChkBox();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersPrimaryChkBox() {
-		fPrimaryChkBox.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fDataIsPrimary = fPrimaryChkBox.getSelection();
-			}
-		});
-	}
-
-	/**
-	 * 
-	 */
-	private void validateUI() {
-		setPageComplete(true);
-	}
-
-	/**
-	 * @param model
-	 * @param extensionPointID
-	 * @return
-	 */
-	public IPluginExtension[] findExtensions(IPluginModelBase model, String extensionPointID) {
-		IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-
-		ArrayList tocExtensions = new ArrayList();
-		for (int i = 0; i < extensions.length; i++) {
-			String point = extensions[i].getPoint();
-			if (extensionPointID.equals(point)) {
-				tocExtensions.add(extensions[i]);
-			}
-		}
-		return (IPluginExtension[]) tocExtensions.toArray(new IPluginExtension[tocExtensions.size()]);
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
deleted file mode 100644
index b97fff0..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLOperation.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-
-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.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-public class TocHTMLOperation extends WorkspaceModifyOperation {
-
-	private IFile fFile;
-
-	private static byte[] getHTMLContent() throws CoreException {
-		String indent = "   "; //$NON-NLS-1$
-		String delimiter = System.getProperty("line.separator"); //$NON-NLS-1$
-
-		StringBuffer buf = new StringBuffer();
-		buf.append("<!DOCTYPE HTML PUBLIC"); //$NON-NLS-1$
-		buf.append(" \"-//W3C//DTD HTML 4.01 Transitional//EN\""); //$NON-NLS-1$
-		buf.append(" \"http://www.w3.org/TR/html4/loose.dtd\">"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append("<html>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append("<head>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append(indent);
-		buf.append("<title>Title</title>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append("</head>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append("<body>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append(indent);
-		buf.append("<h2>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append(indent);
-		buf.append(indent);
-		buf.append("Title"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append(indent);
-		buf.append("</h2>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append(indent);
-		buf.append("<p>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append(indent);
-		buf.append(indent);
-		buf.append("Body"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append(indent);
-		buf.append("</p>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append(indent);
-		buf.append("</body>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		buf.append("</html>"); //$NON-NLS-1$
-		buf.append(delimiter);
-
-		try {
-			return buf.toString().getBytes("UTF8"); //$NON-NLS-1$
-		} catch (UnsupportedEncodingException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			IStatus status = new Status(IStatus.ERROR, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e);
-			throw new CoreException(status);
-		}
-	}
-
-	public TocHTMLOperation(IFile file) {
-		fFile = file;
-	}
-
-	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
-		ByteArrayInputStream stream = new ByteArrayInputStream(getHTMLContent());
-		fFile.setContents(stream, 0, monitor);
-
-		monitor.done();
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java
deleted file mode 100644
index 11698ab..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizard.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard;
-
-public class TocHTMLWizard extends BasicNewFileResourceWizard {
-	protected IFile fNewFile;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#addPages()
-	 */
-	public void addPages() {
-		IWizardPage mainPage = new TocHTMLWizardPage("newHTMLPage1", getSelection());//$NON-NLS-1$
-		mainPage.setTitle(TocWizardMessages.TocHTMLWizard_title);
-		mainPage.setDescription(TocWizardMessages.TocHTMLWizard_description);
-		addPage(mainPage);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		IWizardPage mainPage = getPage("newHTMLPage1"); //$NON-NLS-1$
-		if (!(mainPage instanceof TocHTMLWizardPage)) {
-			return false;
-		}
-
-		fNewFile = ((TocHTMLWizardPage) mainPage).createNewFile();
-		if (fNewFile == null) {
-			return false;
-		}
-
-		try {
-			getContainer().run(false, true, getOperation());
-			selectAndReveal(fNewFile);
-		} catch (InvocationTargetException e) {
-			PDEUserAssistanceUIPlugin.logException(e);
-			fNewFile = null;
-			return false;
-		} catch (InterruptedException e) {
-			fNewFile = null;
-			return false;
-		}
-
-		return true;
-	}
-
-	private WorkspaceModifyOperation getOperation() {
-		return new TocHTMLOperation(fNewFile);
-	}
-
-	public IFile getNewResource() {
-		return fNewFile;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java
deleted file mode 100644
index d4ae140..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocHTMLWizardPage.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-import org.eclipse.pde.internal.ua.ui.editor.toc.HelpEditorUtil;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-/**
- * PDEWizardNewFileCreationPage
- */
-public class TocHTMLWizardPage extends WizardNewFileCreationPage {
-
-	private String fLastFilename;
-
-	/**
-	 * @param pageName
-	 * @param selection
-	 */
-	public TocHTMLWizardPage(String pageName, IStructuredSelection selection) {
-		super(pageName, selection);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validatePage()
-	 */
-	protected boolean validatePage() {
-		fLastFilename = getFileName().trim();
-
-		// Verify the filename is non-empty
-		if (fLastFilename.length() == 0) {
-			// Reset previous error message set if any
-			setErrorMessage(null);
-			return false;
-		}
-
-		// Verify the file name does not begin with a dot
-		if (fLastFilename.charAt(0) == '.') {
-			setErrorMessage(TocWizardMessages.TocHTMLWizardPage_errorMessage1);
-			return false;
-		}
-
-		if(!HelpEditorUtil.hasValidPageExtension(new Path(fLastFilename)))
-		{	String message = NLS.bind(
-				TocWizardMessages.TocHTMLWizardPage_errorMessage2, 
-				HelpEditorUtil.getPageExtensionList());
-		
-			setErrorMessage(message);
-			return false;
-		}
-
-		// Perform default validation
-		return super.validatePage();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validateLinkedResource()
-	 */
-	protected IStatus validateLinkedResource() {
-		return new Status(IStatus.OK, PDEUserAssistanceUIPlugin.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createLinkTarget()
-	 */
-	protected void createLinkTarget() {
-		// NO-OP
-	}
-
-	protected void createAdvancedControls(Composite parent) {
-		// NO-OP
-	}
-
-	public String getFileName() {
-		if (getControl() != null && getControl().isDisposed()) {
-			return fLastFilename;
-		}
-
-		return super.getFileName();
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
deleted file mode 100755
index b0665f7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ua.core.toc.text.TocDocumentFactory;
-import org.eclipse.pde.internal.ua.core.toc.text.TocModel;
-import org.eclipse.pde.internal.ua.core.toc.text.TocTopic;
-import org.eclipse.pde.internal.ua.ui.IConstants;
-import org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin;
-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.ISetSelectionTarget;
-
-public class TocOperation extends WorkspaceModifyOperation {
-
-	private IFile fFile;
-	private String fTocName;
-
-	public TocOperation(IFile file, String tocName) {
-		fFile = file;
-		fTocName = tocName;
-	}
-
-	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-		TocModel model = new TocModel(CoreUtility.getTextDocument(fFile.getContents()), false);
-		model.setUnderlyingResource(fFile);
-		initializeToc(model);
-		model.save();
-		model.dispose();
-		openFile();
-		monitor.done();
-	}
-
-	private void initializeToc(TocModel model) {
-		// Create Topic
-		TocTopic topic = createTopic(model);
-
-		// Bind the created topic to this TOC
-		model.getToc().addChild(topic);
-
-		// Set the initial TOC name 
-		model.getToc().setFieldLabel(fTocName);
-	}
-
-	private TocTopic createTopic(TocModel model) {
-		TocDocumentFactory factory = model.getFactory();
-		TocTopic topic = factory.createTocTopic();
-
-		topic.setFieldLabel(TocWizardMessages.TocOperation_topic);
-
-		return topic;
-	}
-
-	protected void openFile() {
-		Display.getCurrent().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchWindow ww = PDEUserAssistanceUIPlugin.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 {
-					IDE.openEditor(page, fFile, IConstants.TABLE_OF_CONTENTS_EDITOR_ID);
-				} catch (PartInitException e) {
-				}
-			}
-		});
-	}
-
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardMessages.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardMessages.java
deleted file mode 100644
index db8afb7..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardMessages.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@code9.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import org.eclipse.osgi.util.NLS;
-
-public class TocWizardMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ua.ui.wizards.toc.messages"; //$NON-NLS-1$
-	
-	public static String NewTocFileWizard_title;
-	public static String RegisterTocOperation_errorMessage1;
-	public static String RegisterTocOperation_errorMessage2;
-	public static String RegisterTocOperation_task;
-	public static String RegisterTocOperation_task2;
-	public static String RegisterTocOperation_task3;
-	public static String RegisterTocOperation_task4;
-	public static String RegisterTocWizard_link;
-	public static String RegisterTocWizardPage_description;
-	public static String RegisterTocWizardPage_makePrimary;
-	public static String RegisterTocWizardPage_title;
-	public static String TocHTMLWizard_description;
-	public static String TocHTMLWizard_title;
-	public static String TocHTMLWizardPage_errorMessage1;
-	public static String TocHTMLWizardPage_errorMessage2;
-	public static String TocOperation_topic;
-	public static String TocWizardPage_description;
-	public static String TocWizardPage_errorMessage;
-	public static String TocWizardPage_name;
-	public static String TocWizardPage_title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, TocWizardMessages.class);
-	}
-
-	private TocWizardMessages() {
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java
deleted file mode 100755
index 6900464..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ua.ui.wizards.toc;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-public class TocWizardPage extends PDEWizardNewFileCreationPage {
-
-	private static String EXTENSION = "xml"; //$NON-NLS-1$
-
-	public TocWizardPage(String pageName, IStructuredSelection selection) {
-		super(pageName, selection);
-		setTitle(TocWizardMessages.TocWizardPage_title);
-		setDescription(TocWizardMessages.TocWizardPage_description);
-		// Force the file extension to be 'xml'
-		setFileExtension(EXTENSION);
-	}
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.TOC_PAGE);
-	}
-
-	protected void createAdvancedControls(Composite parent) {
-	}
-
-	protected boolean validatePage() {
-		String tocName = getTocName();
-		if (tocName == null) {
-			return false;
-		}
-
-		tocName = tocName.trim();
-		// Verify the TOC name is non-empty
-		if (tocName.length() == 0) {
-			// Set the appropriate error message
-			setErrorMessage(TocWizardMessages.TocWizardPage_errorMessage);
-			return false;
-		}
-		// Perform default validation
-		return super.validatePage();
-	}
-
-	public String getTocName() {
-		return TocWizardMessages.TocWizardPage_name;
-	}
-}

diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/messages.properties b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/messages.properties
deleted file mode 100644
index 1210496..0000000
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/messages.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-NewTocFileWizard_title=New table of contents
-RegisterTocOperation_errorMessage1=Operation aborted because manifest file is read-only
-RegisterTocOperation_errorMessage2=Operation aborted because manifest file is read-only
-RegisterTocOperation_task=Adding new toc extension to existing plug-in manifest file...
-RegisterTocOperation_task2=Modifying existing toc extension in existing plug-in manifest file...
-RegisterTocOperation_task3=Modifying existing toc element in existing plug-in manifest file...
-RegisterTocOperation_task4=Adding new toc extension to new plug-in manifest file...
-RegisterTocWizard_link=Register Table of Contents
-RegisterTocWizardPage_description=Add this table of contents to the Help Infocenter
-RegisterTocWizardPage_makePrimary=Make this a &primary table of contents
-RegisterTocWizardPage_title=Table of contents
-TocHTMLWizard_description=Create a new HTML page.
-TocHTMLWizard_title=New Page
-TocHTMLWizardPage_errorMessage1=The file name must not begin with a '.'
-TocHTMLWizardPage_errorMessage2=The file name must contain an HTML file extension ({0}).
-TocOperation_topic=Topic
-TocWizardPage_description=Create a new table of contents.
-TocWizardPage_errorMessage=A name must be specified for this table of contents.
-TocWizardPage_name=Book
-TocWizardPage_title=Table of contents

diff --git a/ui/org.eclipse.pde.junit.runtime/.classpath b/ui/org.eclipse.pde.junit.runtime/.classpath
deleted file mode 100644
index ce73933..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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<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 cb2fad3..0000000
--- a/ui/org.eclipse.pde.junit.runtime/.project
+++ /dev/null

@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

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

@@ -1,344 +0,0 @@
-#Thu Jan 03 09:04:25 CST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-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=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 59db464..0000000
--- a/ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Fri Jan 04 13:58:27 CST 2008
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

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 ba21983..0000000
--- a/ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,13 +0,0 @@
-#Wed Mar 29 03:58:48 EST 2006
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-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 1f259f0..0000000
--- a/ui/org.eclipse.pde.junit.runtime/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde.junit.runtime; singleton:=true
-Bundle-Version: 3.4.100.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.junit.runtime;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
- org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional
-Export-Package: org.eclipse.pde.internal.junit.runtime;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

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 4602330..0000000
--- a/ui/org.eclipse.pde.junit.runtime/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</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 0e26578..0000000
--- a/ui/org.eclipse.pde.junit.runtime/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/
-bin.includes = .,\
-               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 a2b6967..0000000
--- a/ui/org.eclipse.pde.junit.runtime/plugin.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 Runtime Support
-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 02be040..0000000
--- a/ui/org.eclipse.pde.junit.runtime/plugin.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.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>
-
-   <extension
-         id="uitestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            visible="false">
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.UITestApplication">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="legacytestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            visible="false">
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.LegacyUITestApplication">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="coretestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            visible="false">
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.CoreTestApplication">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="coretestapplicationnonmain"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="1"
-            thread="any"
-            visible="false">
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.CoreTestApplication">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="nonuithreadtestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            visible="false">
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.NonUIThreadTestApplication">
-         </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 cf21d17..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/CoreTestApplication.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, 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.IPlatformRunnable;
-
-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/LegacyUITestApplication.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyUITestApplication.java
deleted file mode 100644
index 72bd98e..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyUITestApplication.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, 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.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.core.runtime.IProduct;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.testing.ITestHarness;
-import org.eclipse.ui.testing.TestableObject;
-
-/**
- * A Workbench that runs a test suite specified in the
- * command line arguments.
- */
-public class LegacyUITestApplication 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.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/NonUIThreadTestApplication.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/NonUIThreadTestApplication.java
deleted file mode 100644
index 1d7f861..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/NonUIThreadTestApplication.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import org.eclipse.core.runtime.Platform;
-
-/**
- * A Workbench that runs a test suite specified in the
- * command line arguments.
- */
-public class NonUIThreadTestApplication extends UITestApplication {
-
-	public void runTests() {
-		fTestableObject.testingStarting();
-		RemotePluginTestRunner.main(Platform.getCommandLineArgs());
-		fTestableObject.testingFinished();
-	}
-
-}

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 cc18d3c..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2003, 2010 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *     Ralf Ebert - Bug 307076 : JUnit Plug-in test runner exception "No Classloader found for plug-in ..." is confusing 
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Locale;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.internal.junit.runner.RemoteTestRunner;
-import org.osgi.framework.Bundle;
-
-/**
- * Runs JUnit tests contained inside a plugin.
- */
-public class RemotePluginTestRunner extends RemoteTestRunner {
-
-	private String fTestPluginName;
-	private ClassLoader fLoaderClassLoader;
-
-	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 RemoteTestRunner#getTestClassLoader()
-	 */
-	protected ClassLoader getTestClassLoader() {
-		final String pluginId = fTestPluginName;
-		return getClassLoader(pluginId);
-	}
-
-	public ClassLoader getClassLoader(final String bundleId) {
-		Bundle bundle = Platform.getBundle(bundleId);
-		if (bundle == null) {
-			throw new IllegalArgumentException("Bundle \"" + bundleId + "\" not found. Possible causes include missing dependencies, too restrictive version ranges, or a non-matching required execution environment."); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return new BundleClassLoader(bundle);
-	}
-
-	public void init(String[] args) {
-		readPluginArgs(args);
-		defaultInit(args);
-	}
-
-	public void readPluginArgs(String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			if (isFlag(args, i, "-testpluginname")) //$NON-NLS-1$
-				fTestPluginName = args[i + 1];
-
-			if (isFlag(args, i, "-loaderpluginname")) //$NON-NLS-1$
-				fLoaderClassLoader = getClassLoader(args[i + 1]);
-		}
-
-		if (fTestPluginName == null)
-			throw new IllegalArgumentException("Parameter -testpluginnname not specified."); //$NON-NLS-1$
-
-		if (fLoaderClassLoader == null)
-			fLoaderClassLoader = getClass().getClassLoader();
-	}
-
-	protected Class loadTestLoaderClass(String className) throws ClassNotFoundException {
-		return fLoaderClassLoader.loadClass(className);
-	}
-
-	private boolean isFlag(String[] args, int i, final String wantedFlag) {
-		String lowerCase = args[i].toLowerCase(Locale.ENGLISH);
-		return lowerCase.equals(wantedFlag) && i < args.length - 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 68eddfe..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/UITestApplication.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Carsten Reckord <eclipse@reckord.de> - bug 288343
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import junit.framework.Assert;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.testing.ITestHarness;
-import org.eclipse.ui.testing.TestableObject;
-
-/**
- * A Workbench that runs a test suite specified in the
- * command line arguments.
- */
-public class UITestApplication implements IApplication, ITestHarness {
-
-	private static final String DEFAULT_APP_3_0 = "org.eclipse.ui.ide.workbench"; //$NON-NLS-1$
-
-	protected TestableObject fTestableObject;
-	protected IApplication fApplication;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) throws Exception {
-		String[] args = (String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
-		Object app = getApplication(args);
-
-		Assert.assertNotNull(app);
-
-		fTestableObject = PlatformUI.getTestableObject();
-		fTestableObject.setTestHarness(this);
-		if (app instanceof IApplication) {
-			fApplication = (IApplication) app;
-			return fApplication.start(context);
-		}
-		return ((IPlatformRunnable) app).run(args);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		if (fApplication != null)
-			fApplication.stop();
-	}
-
-	/*
-	 * return the application to run, or null if not even the default application
-	 * is found.
-	 */
-	private Object 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 || runnable instanceof IApplication)
-					return 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.
-	 * 
-	 * see bug 228044
-	 * 
-	 */
-	private String getApplicationToRun(String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			if (args[i].equals("-testApplication") && i < args.length - 1) //$NON-NLS-1$
-				return args[i + 1];
-		}
-		IProduct product = Platform.getProduct();
-		if (product != null)
-			return product.getApplication();
-		return DEFAULT_APP_3_0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.testing.ITestHarness#runTests()
-	 */
-	public void runTests() {
-		try {
-			fTestableObject.testingStarting();
-			fTestableObject.runTest(new Runnable() {
-				public void run() {
-					RemotePluginTestRunner.main(Platform.getCommandLineArgs());
-				}
-			});
-		} finally {
-			fTestableObject.testingFinished();
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java
index 3f44070..e08b202 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java

@@ -37,6 +37,7 @@
 	public static final int DELETE_WORKSPACE = 2002;
 	public static final int GENERATE_CONFIG_INI = 2003;
 	public static final int ORGANIZE_MANIFESTS = 2004;
+	public static final int SELECT_WORKSPACE_FIELD = 2005;
 
 	private static final String TIMESTAMP = "timestamp"; //$NON-NLS-1$
 	private static final String FILE_NAME = "dep-timestamp.properties"; //$NON-NLS-1$

diff --git a/ui/org.eclipse.pde.runtime/.classpath b/ui/org.eclipse.pde.runtime/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/ui/org.eclipse.pde.runtime/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<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 2df47d2..0000000
--- a/ui/org.eclipse.pde.runtime/.project
+++ /dev/null

@@ -1,34 +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>

-		<buildCommand>

-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

-	</natures>

-</projectDescription>


diff --git a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.runtime/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1a4cdbd..0000000
--- a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.core.resources.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Fri Oct 20 13:22:13 EDT 2006
-eclipse.preferences.version=1
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/default.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/implied.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/osname.aliases=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases=UTF-8
-encoding/<project>=ISO-8859-1

diff --git a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 60af2c9..0000000
--- a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,352 +0,0 @@
-#Mon Oct 13 14:57:59 CDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.launching.prefs b/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 08eb112..0000000
--- a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Mon Oct 13 14:57:59 CDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning

diff --git a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index fd5da18..0000000
--- a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Mon Oct 13 14:57:58 CDT 2008
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde.runtime/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 113bccf..0000000
--- a/ui/org.eclipse.pde.runtime/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,16 +0,0 @@
-#Wed Jan 02 09:57:24 CST 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-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.runtime/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 6e61ff9..0000000
--- a/ui/org.eclipse.pde.runtime/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %name
-Bundle-SymbolicName: org.eclipse.pde.runtime; singleton:=true
-Bundle-Version: 3.4.200.qualifier
-Bundle-Activator: org.eclipse.pde.internal.runtime.PDERuntimePlugin
-Bundle-Vendor: %provider-name
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.jdt.ui;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.pde.ui;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=optional
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.pde.internal.runtime;x-internal:=true,
- org.eclipse.pde.internal.runtime.registry;x-internal:=true,
- org.eclipse.pde.internal.runtime.registry.model;x-internal:=true,
- org.eclipse.pde.internal.runtime.spy;x-internal:=true,
- org.eclipse.pde.internal.runtime.spy.dialogs;x-internal:=true,
- org.eclipse.pde.internal.runtime.spy.handlers;x-internal:=true,
- org.eclipse.pde.internal.runtime.spy.sections;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy

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

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</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 add70b8..0000000
--- a/ui/org.eclipse.pde.runtime/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/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/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/cpyqual_menu.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/cpyqual_menu.gif
deleted file mode 100644
index 55e2d04..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/cpyqual_menu.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/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/attr_xml_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/attr_xml_obj.gif
deleted file mode 100644
index c4ad57c..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/attr_xml_obj.gif
+++ /dev/null
Binary files differ

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

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

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

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

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.gif
deleted file mode 100644
index b616e85..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.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/frgmt_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/frgmt_obj.gif
deleted file mode 100755
index d55b09f..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/frgmt_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/int_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/int_obj.gif
deleted file mode 100644
index 2ebc46e..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/int_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/location_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/location_obj.gif
deleted file mode 100644
index c43c5d5..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/location_obj.gif
+++ /dev/null
Binary files differ

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

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/menuspy_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/menuspy_obj.gif
deleted file mode 100644
index 4c8d71c..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/menuspy_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/package_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/package_obj.gif
deleted file mode 100644
index 131c28d..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/package_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/pdespy_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/pdespy_obj.gif
deleted file mode 100644
index 148f4d5..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/pdespy_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/plugins_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/plugins_obj.gif
deleted file mode 100755
index 0fa090a..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/plugins_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/property_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/property_obj.gif
deleted file mode 100644
index f8277cf..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/property_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/save_image_as_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/save_image_as_obj.gif
deleted file mode 100644
index bafc136..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/save_image_as_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/default_co.gif b/ui/org.eclipse.pde.runtime/icons/ovr16/default_co.gif
deleted file mode 100644
index 8533e2e..0000000
--- a/ui/org.eclipse.pde.runtime/icons/ovr16/default_co.gif
+++ /dev/null
Binary files differ

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

diff --git a/ui/org.eclipse.pde.runtime/icons/ovr16/export_co.gif b/ui/org.eclipse.pde.runtime/icons/ovr16/export_co.gif
deleted file mode 100644
index b18233d..0000000
--- a/ui/org.eclipse.pde.runtime/icons/ovr16/export_co.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 1439826..0000000
--- a/ui/org.eclipse.pde.runtime/plugin.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = PDE Runtime
-provider-name = Eclipse.org
-
-views.category.name = Plug-in Development
-views.registry.name= Plug-in Registry
-
-spy-category.name = Spy
-spy-command.name = Plug-in Selection Spy
-spy-command.description = Show the Plug-in Spy
-spy-menu-command.name = Plug-in Menu Spy
-

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

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.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>
-
-<!-- Extensions -->
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%views.registry.name"
-            icon="$nl$/icons/eview16/registry.gif"
-            category="org.eclipse.pde.ui"
-            class="org.eclipse.pde.internal.runtime.registry.RegistryBrowser"
-            id="org.eclipse.pde.runtime.RegistryBrowser">
-      </view>
-      <category
-            id="org.eclipse.pde.ui"
-            name="%views.category.name">
-      </category>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            id="org.eclipse.pde.runtime.spy.commands.category"
-            name="%spy-category.name">
-      </category>
-      <command
-            categoryId="org.eclipse.pde.runtime.spy.commands.category"
-            description="%spy-command.description"
-            id="org.eclipse.pde.runtime.spy.commands.spyCommand"
-            name="%spy-command.name">
-      </command>
-      <command
-            categoryId="org.eclipse.pde.runtime.spy.commands.category"
-            description="%spy-command.description"
-            id="org.eclipse.pde.runtime.spy.commands.menuSpyCommand"
-            name="%spy-menu-command.name">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commandImages">
-      <image
-            commandId="org.eclipse.pde.runtime.spy.commands.spyCommand"
-            icon="$nl$/icons/obj16/pdespy_obj.gif">
-      </image>
-      <image
-            commandId="org.eclipse.pde.runtime.spy.commands.menuSpyCommand"
-            icon="$nl$/icons/obj16/menuspy_obj.gif">
-      </image>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.eclipse.pde.runtime.spy.commands.spyCommand"
-            contextId="org.eclipse.ui.contexts.dialogAndWindow"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M3+M2+F1">
-      </key>
-       <key
-            contextId="org.eclipse.ui.contexts.dialogAndWindow"
-            locale="ja"
-            platform="carbon"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M3+M2+F1">
-      </key>
-      <key
-            commandId="org.eclipse.pde.runtime.spy.commands.spyCommand"
-            contextId="org.eclipse.ui.contexts.dialogAndWindow"
-            locale="ja"
-            platform="carbon"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M1+M3+F1">
-      </key>
-      <key
-            commandId="org.eclipse.pde.runtime.spy.commands.menuSpyCommand"
-            contextId="org.eclipse.ui.contexts.dialogAndWindow"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M3+M2+F2">
-      </key>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.pde.internal.runtime.spy.handlers.SpyHandler"
-            commandId="org.eclipse.pde.runtime.spy.commands.spyCommand">
-      </handler>
-      <handler
-            class="org.eclipse.pde.internal.runtime.spy.handlers.MenuSpyHandler"
-            commandId="org.eclipse.pde.runtime.spy.commands.menuSpyCommand">
-      </handler>
-   </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 bdbdb9d..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/IHelpContextIds.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-public interface IHelpContextIds {
-	public static final String PREFIX = "org.eclipse.pde.doc.user" + "."; //$NON-NLS-1$ //$NON-NLS-2$
-
-	public static final String REGISTRY_VIEW = PREFIX + "registry_view"; //$NON-NLS-1$
-	public static final String SPY_DIALOG = PREFIX + "spy_dialog"; //$NON-NLS-1$
-
-}

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

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.osgi.service.resolver.BundleSpecification;
-import org.eclipse.osgi.service.resolver.ImportPackageSpecification;
-import org.eclipse.osgi.service.resolver.VersionConstraint;
-import org.eclipse.osgi.util.NLS;
-
-public class MessageHelper {
-	public static String getResolutionFailureMessage(VersionConstraint unsatisfied) {
-		if (unsatisfied.isResolved())
-			throw new IllegalArgumentException();
-		if (unsatisfied instanceof ImportPackageSpecification)
-			return NLS.bind(PDERuntimeMessages.MessageHelper_missing_imported_package, toString(unsatisfied));
-		else if (unsatisfied instanceof BundleSpecification) {
-			if (((BundleSpecification) unsatisfied).isOptional())
-				return NLS.bind(PDERuntimeMessages.MessageHelper_missing_optional_required_bundle, toString(unsatisfied));
-			return NLS.bind(PDERuntimeMessages.MessageHelper_missing_required_bundle, toString(unsatisfied));
-		} else
-			return NLS.bind(PDERuntimeMessages.MessageHelper_missing_host, toString(unsatisfied));
-	}
-
-	private static String toString(VersionConstraint constraint) {
-		org.eclipse.osgi.service.resolver.VersionRange versionRange = constraint.getVersionRange();
-		if (versionRange == null)
-			return constraint.getName();
-		return constraint.getName() + '_' + versionRange;
-	}
-
-}

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 141aa21..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, 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.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-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 1d2e9d6..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of 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 ActiveFormEditorSection_Active_Form_Page;
-
-	public static String ActiveMenuSection_0;
-	public static String ActiveMenuSection_1;
-	public static String ActiveMenuSection_2;
-	public static String ActiveMenuSection_3;
-	public static String ActiveMenuSection_4;
-	public static String ActiveMenuSection_5;
-	public static String ActiveMenuSection_6;
-	public static String ActiveMenuSection_7;
-
-	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 RegistryView_found_problems;
-	public static String RegistryView_showRunning_label;
-	public static String RegistryView_showDisabled_label;
-	public static String RegistryView_showAdvanced_label;
-	public static String RegistryView_titleSummary;
-	public static String RegistryView_startAction_label;
-	public static String RegistryView_stopAction_label;
-	public static String RegistryView_enableAction_label;
-	public static String RegistryView_diag_dialog_title;
-
-	public static String RegistryView_diagnoseAction_label;
-	public static String RegistryView_disableAction_label;
-	public static String RegistryView_no_unresolved_constraints;
-
-	public static String MessageHelper_missing_optional_required_bundle;
-	public static String MessageHelper_missing_required_bundle;
-	public static String MessageHelper_missing_imported_package;
-	public static String MessageHelper_missing_host;
-
-	public static String SpyDialog_title;
-	public static String MenuSpyDialog_title;
-	public static String SpyDialog_close;
-	public static String SpyDialog_activeShell_title;
-	public static String SpyDialog_activeShell_desc;
-	public static String SpyDialog_activePart_title;
-	public static String SpyDialog_activePart_desc;
-	public static String SpyDialog_activeWizard_title;
-	public static String SpyDialog_activeWizard_desc;
-	public static String SpyDialog_activeMenuIds;
-	public static String SpyDialog_contributingPluginId_title;
-	public static String SpyDialog_contributingPluginId_desc;
-	public static String SpyDialog_activeSelection_title;
-	public static String SpyDialog_activeSelection_desc;
-	public static String SpyDialog_activeSelectionInterfaces_desc;
-	public static String SpyDialog_activeSelectedElementsCount_desc;
-	public static String SpyDialog_activeSelectedElement_desc;
-	public static String SpyDialog_activeSelectedElementInterfaces_desc;
-	public static String SpyDialog_activeDialogPageSection_title;
-	public static String SpyDialog_activeDialogPageSection_title2;
-	public static String SpyDialog_activeDialogPageSection_desc;
-	public static String SpyDialog_activeHelpSection_title;
-	public static String SpyDialog_activeHelpSection_desc;
-	public static String SpyIDEUtil_noSourceFound_title;
-	public static String SpyIDEUtil_noSourceFound_message;
-	public static String SpyDialog_activePageBook_title;
-
-	public static String SpyFormToolkit_saveImageAs_title;
-	public static String SpyFormToolkit_copyQualifiedName;
-
-	public static String RegistryBrowser_Bundle;
-
-	public static String RegistryBrowser_copy_label;
-
-	public static String RegistryBrowser_ExtensionPoint;
-
-	public static String RegistryBrowser_extensionPoints;
-
-	public static String RegistryBrowser_GroupBy;
-
-	public static String RegistryBrowser_InitializingView;
-	public static String RegistryBrowser_plugins;
-
-	public static String RegistryBrowser_Service;
-
-	public static String RegistryBrowser_Services;
-
-	public static String RegistryBrowserLabelProvider_contributedBy;
-
-	public static String RegistryBrowserLabelProvider_ExportedPackages;
-
-	public static String RegistryBrowserLabelProvider_Fragments;
-
-	public static String RegistryBrowserLabelProvider_ImportedPackages;
-
-	public static String RegistryBrowserLabelProvider_Properties;
-
-	public static String RegistryBrowserLabelProvider_RegisteredBy;
-	public static String RegistryBrowserLabelProvider_usedServices;
-	public static String RegistryBrowserLabelProvider_registeredServices;
-
-	public static String RegistryBrowserLabelProvider_UsingBundles;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, PDERuntimeMessages.class);
-	}
-
-}

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 d3d1abd..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePlugin.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, 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.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.service.resolver.PlatformAdmin;
-import org.eclipse.osgi.service.resolver.State;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class PDERuntimePlugin extends AbstractUIPlugin {
-
-	public static final String ID = "org.eclipse.pde.runtime"; //$NON-NLS-1$
-
-	private static PDERuntimePlugin inst;
-	private BundleContext fContext;
-	private ServiceTracker packageAdminTracker;
-	private ServiceTracker platformAdminTracker;
-
-	public PDERuntimePlugin() {
-		inst = this;
-	}
-
-	private static boolean isBundleAvailable(String bundleID) {
-		Bundle bundle = Platform.getBundle(bundleID);
-		return bundle != null && (bundle.getState() & (Bundle.ACTIVE | Bundle.STARTING | Bundle.RESOLVED)) != 0;
-	}
-
-	public static final boolean HAS_IDE_BUNDLES;
-	static {
-		boolean result = false;
-		try {
-			result = isBundleAvailable("org.eclipse.core.resources") //$NON-NLS-1$
-					&& isBundleAvailable("org.eclipse.pde.core") //$NON-NLS-1$
-					&& isBundleAvailable("org.eclipse.jdt.core") //$NON-NLS-1$
-					&& isBundleAvailable("org.eclipse.help") //$NON-NLS-1$
-					&& isBundleAvailable("org.eclipse.pde.ui") //$NON-NLS-1$
-					&& isBundleAvailable("org.eclipse.jdt.ui"); //$NON-NLS-1$
-		} catch (Throwable exception) { // do nothing
-		}
-		HAS_IDE_BUNDLES = result;
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		return getDefault().internalGetActivePage();
-	}
-
-	public static Shell getActiveWorkbenchShell() {
-		return getActiveWorkbenchWindow().getShell();
-	}
-
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public PackageAdmin getPackageAdmin() {
-		if (packageAdminTracker == null) {
-			return null;
-		}
-		return (PackageAdmin) packageAdminTracker.getService();
-	}
-
-	public PlatformAdmin getPlatformAdmin() {
-		if (platformAdminTracker == null) {
-			return null;
-		}
-		return (PlatformAdmin) platformAdminTracker.getService();
-	}
-
-	public static PDERuntimePlugin getDefault() {
-		return inst;
-	}
-
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	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;
-
-		packageAdminTracker = new ServiceTracker(context, PackageAdmin.class.getName(), null);
-		packageAdminTracker.open();
-
-		platformAdminTracker = new ServiceTracker(context, PlatformAdmin.class.getName(), null);
-		platformAdminTracker.open();
-	}
-
-	public BundleContext getBundleContext() {
-		return this.fContext;
-	}
-
-	public State getState() {
-		return getPlatformAdmin().getState(false);
-	}
-
-	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 if (e.getMessage() != null) {
-			status = new Status(IStatus.ERROR, ID, IStatus.OK, e.getMessage(), e);
-		}
-		if (status != null)
-			getDefault().getLog().log(status);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		if (packageAdminTracker != null) {
-			packageAdminTracker.close();
-			packageAdminTracker = null;
-		}
-		if (platformAdminTracker != null) {
-			platformAdminTracker.close();
-			platformAdminTracker = 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 62812c3..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.URL;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-public class PDERuntimePluginImages {
-
-	private static ImageRegistry PLUGIN_REGISTRY;
-
-	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_DCL = ICONS_PATH + "dlcl16/"; //$NON-NLS-1$
-	private static final String PATH_LCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$
-	private static final String PATH_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$
-
-	// Plug-in Spy related images
-	public static final String IMG_CLASS_OBJ = "class_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_INTERFACE_OBJ = "int_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_PLUGIN_OBJ = "plugin_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_SPY_OBJ = "pdespy_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_MENU_OBJ = "menu_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_ID_OBJ = "generic_xml_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_MENUSPY_OBJ = "menuspy_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_CONTEXTID_OBJ = "contextid_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_SAVE_IMAGE_AS_OBJ = "save_image_as_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_COPY_QNAME = "cpyqual_menu.gif"; //$NON-NLS-1$
-
-	public static final ImageDescriptor CLASS_OBJ = create(PATH_OBJ, IMG_CLASS_OBJ);
-	public static final ImageDescriptor INTERFACE_OBJ = create(PATH_OBJ, IMG_INTERFACE_OBJ);
-	public static final ImageDescriptor PLUGIN_OBJ = create(PATH_OBJ, IMG_PLUGIN_OBJ);
-	public static final ImageDescriptor SPY_OBJ = create(PATH_OBJ, IMG_SPY_OBJ);
-	public static final ImageDescriptor MENU_OBJ = create(PATH_OBJ, IMG_MENU_OBJ);
-	public static final ImageDescriptor ID_OBJ = create(PATH_OBJ, IMG_ID_OBJ);
-	public static final ImageDescriptor MENUSPY_OBJ = create(PATH_OBJ, IMG_MENUSPY_OBJ);
-	public static final ImageDescriptor CONTEXTID_OBJ = create(PATH_OBJ, IMG_CONTEXTID_OBJ);
-	public static final ImageDescriptor SAVE_IMAGE_AS_OBJ = create(PATH_OBJ, IMG_SAVE_IMAGE_AS_OBJ);
-	public static final ImageDescriptor COPY_QNAME = create(PATH_LCL, IMG_COPY_QNAME);
-
-	public static final ImageDescriptor DESC_REFRESH_DISABLED = create(PATH_DCL, "refresh.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REFRESH = create(PATH_LCL, "refresh.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COLLAPSE_ALL = create(PATH_LCL, "collapseall.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_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_ATTR_XML_OBJ = create(PATH_OBJ, "attr_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$
-	public static final ImageDescriptor DESC_LOCATION = create(PATH_OBJ, "location_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_IMP_OBJ = create(PATH_OBJ, "bundle-importer.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXP_OBJ = create(PATH_OBJ, "bundle-exporter.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SERVICE_OBJ = create(PATH_OBJ, "int_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PROPERTY_OBJ = create(PATH_OBJ, "property_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PLUGINS_OBJ = create(PATH_OBJ, "plugins_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_PACKAGE_OBJ = create(PATH_OBJ, "package_obj.gif"); //$NON-NLS-1$
-
-	/*
-	 * Overlays
-	 */
-	public static final ImageDescriptor DESC_RUN_CO = create(PATH_OVR, "run_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_ERROR_CO = create(PATH_OVR, "error_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEFAULT_CO = create(PATH_OVR, "default_co.gif"); //$NON-NLS-1$
-
-	private static final void initialize() {
-		PLUGIN_REGISTRY = PDERuntimePlugin.getDefault().getImageRegistry();
-		manage(IMG_CLASS_OBJ, CLASS_OBJ);
-		manage(IMG_INTERFACE_OBJ, INTERFACE_OBJ);
-		manage(IMG_PLUGIN_OBJ, PLUGIN_OBJ);
-		manage(IMG_SPY_OBJ, SPY_OBJ);
-		manage(IMG_MENU_OBJ, MENU_OBJ);
-		manage(IMG_ID_OBJ, ID_OBJ);
-		manage(IMG_MENUSPY_OBJ, MENUSPY_OBJ);
-		manage(IMG_CONTEXTID_OBJ, CONTEXTID_OBJ);
-		manage(IMG_SAVE_IMAGE_AS_OBJ, SAVE_IMAGE_AS_OBJ);
-		manage(IMG_COPY_QNAME, COPY_QNAME);
-	}
-
-	private static ImageDescriptor create(String prefix, String name) {
-		return ImageDescriptor.createFromURL(makeIconURL(prefix, name));
-	}
-
-	public static Image get(String key) {
-		if (PLUGIN_REGISTRY == null)
-			initialize();
-		return PLUGIN_REGISTRY.get(key);
-	}
-
-	private static URL makeIconURL(String prefix, String name) {
-		String path = "$nl$/" + prefix + name; //$NON-NLS-1$
-		return FileLocator.find(PDERuntimePlugin.getDefault().getBundle(), new Path(path), null);
-	}
-
-	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/pderuntimeresources.properties b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties
deleted file mode 100644
index fbc68f9..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties
+++ /dev/null

@@ -1,98 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
-#
-
-ActiveFormEditorSection_Active_Form_Page=Active Form Page
-ActiveMenuSection_0=The active contribution item identifier:
-ActiveMenuSection_1=The active action set identifier:
-ActiveMenuSection_2=The active contribution item class:
-ActiveMenuSection_3=The active handler:
-ActiveMenuSection_4=The active action definition identifier:
-ActiveMenuSection_5=The active contribution item class:
-ActiveMenuSection_6=The active contribution item class:
-ActiveMenuSection_7=The active contribution location URI:
-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
-RegistryView_found_problems=The following problems were found:
-RegistryView_showRunning_label = &Show Active Plug-ins Only
-RegistryView_showDisabled_label = Show &Disabled Plug-ins Only
-RegistryView_showAdvanced_label = Show Advanced &Operations
-RegistryBrowser_Bundle=&Plug-in
-RegistryBrowser_copy_label=&Copy
-RegistryBrowser_ExtensionPoint=&Extension Point
-RegistryBrowser_extensionPoints=extension points
-RegistryBrowser_GroupBy=&Group By
-RegistryBrowser_InitializingView=Initializing the Plug-in Registry view
-RegistryBrowser_plugins=plug-ins
-RegistryBrowser_Service=&Service
-RegistryBrowser_Services=services
-RegistryBrowserLabelProvider_contributedBy=contributed by: {0}
-RegistryBrowserLabelProvider_ExportedPackages=Exported Packages
-RegistryBrowserLabelProvider_Fragments=Fragments
-RegistryBrowserLabelProvider_ImportedPackages=Imported Packages
-RegistryBrowserLabelProvider_Properties=Properties
-RegistryBrowserLabelProvider_RegisteredBy=Registered by 
-RegistryBrowserLabelProvider_usedServices=Used Services
-RegistryBrowserLabelProvider_registeredServices=Registered Services
-RegistryBrowserLabelProvider_UsingBundles=Using bundles
-RegistryView_titleSummary = Filter matched {0} of {1} {2}.
-RegistryView_startAction_label = Start
-RegistryView_stopAction_label = Stop
-RegistryView_enableAction_label = Enable
-RegistryView_diag_dialog_title=Diagnosis
-RegistryView_diagnoseAction_label=Diagnose
-RegistryView_disableAction_label = Disable
-RegistryView_no_unresolved_constraints=No problems detected.
-
-MessageHelper_missing_optional_required_bundle=Missing optionally required bundle {0}
-MessageHelper_missing_required_bundle=Missing required bundle {0}
-MessageHelper_missing_imported_package=Missing imported package {0}
-MessageHelper_missing_host=Missing host {0}
-
-# Plug-in Spy
-SpyDialog_title = Plug-in Selection Spy
-MenuSpyDialog_title = Plug-in Menu Spy
-SpyDialog_close = &Close
-SpyDialog_activeShell_title = Active Shell
-SpyDialog_activeShell_desc = The active shell class:
-SpyDialog_activeWizard_title = Active Wizard ({0})
-SpyDialog_activeWizard_desc = The active wizard class:
-SpyDialog_activePart_title = Active Part ({0})
-SpyDialog_activePart_desc = The active {0} class:
-SpyDialog_activeMenuIds = The active menu contribution identifiers:
-SpyDialog_contributingPluginId_title = The contributing plug-in:
-SpyDialog_contributingPluginId_desc = The active {0} identifier:
-SpyDialog_activeSelection_title = Active Selection
-SpyDialog_activeSelection_desc = The selection class:
-SpyDialog_activeSelectionInterfaces_desc = The interfaces valid for the selection:
-SpyDialog_activeSelectedElement_desc = The type of the selected element:
-SpyDialog_activeSelectedElementInterfaces_desc = The interfaces valid for the selected element:
-SpyDialog_activeSelectedElementsCount_desc = {0} elements selected
-SpyDialog_activeDialogPageSection_title = Active Page ({0})
-SpyDialog_activeDialogPageSection_title2 = Active Page
-SpyDialog_activeDialogPageSection_desc = The active page class:
-SpyDialog_activeHelpSection_title = Active Help
-SpyDialog_activeHelpSection_desc = The active help context identifiers:
-SpyIDEUtil_noSourceFound_title = Source Lookup Error
-SpyIDEUtil_noSourceFound_message = Unable to find source for class ''{0}''
-
-SpyDialog_activePageBook_title=The active page:
-
-SpyFormToolkit_saveImageAs_title = Save Image As...
-SpyFormToolkit_copyQualifiedName = Copy Qualified Name
\ No newline at end of file

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

@@ -1,42 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *     Benjamin Muskalla <b.muskalla@gmx.net> - bug 207831
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.registry;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-public class DiagnosticsDialog extends ErrorDialog {
-
-	public DiagnosticsDialog(Shell parentShell, String dialogTitle, String message, IStatus status, int displayMask) {
-		super(parentShell, dialogTitle, message, status, displayMask);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Control area = super.createDialogArea(parent);
-		createDropDownList((Composite) area);
-		return area;
-	}
-
-	/*
-	 * (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);
-	}
-
-}
\ No newline at end of file

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 cd5033e..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
+++ /dev/null

@@ -1,731 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 211127
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.registry;
-
-import java.util.*;
-import java.util.List;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.pde.internal.runtime.registry.model.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.ui.part.DrillDownAdapter;
-import org.eclipse.ui.part.ViewPart;
-import org.osgi.framework.BundleException;
-
-public class RegistryBrowser extends ViewPart {
-
-	private class GroupByAction extends Action {
-		private int actionGroupBy;
-
-		public GroupByAction(String name, int groupBy) {
-			super(name, AS_RADIO_BUTTON);
-			this.actionGroupBy = groupBy;
-		}
-
-		public void run() {
-			if (isChecked()) {
-				fMemento.putInteger(GROUP_BY, actionGroupBy);
-				// refreshAction takes into account checked state of fShowExtensionsOnlyAction
-				// (via updateItems(true)
-				fRefreshAction.run();
-			}
-		}
-	}
-
-	public static final String SHOW_RUNNING_PLUGINS = "RegistryView.showRunning.label"; //$NON-NLS-1$
-	public static final String SHOW_ADVANCED_MODE = "RegistryView.showAdvancedMode.label"; //$NON-NLS-1$
-	public static final String GROUP_BY = "RegistryView.groupBy"; //$NON-NLS-1$ 
-	public static final String SHOW_DISABLED_MODE = "RegistryView.showDisabledMode.label"; //$NON-NLS-1$
-
-	public static final int BUNDLES = 0;
-	public static final int EXTENSION_REGISTRY = 1;
-	public static final int SERVICES = 2;
-
-	private FilteredTree fFilteredTree;
-	private TreeViewer fTreeViewer;
-	private IMemento fMemento;
-
-	private RegistryModel model;
-	private ModelChangeListener listener;
-	private Job initializeModelJob;
-
-	private RegistryBrowserContentProvider fContentProvider;
-	private RegistryBrowserLabelProvider fLabelProvider;
-
-	private static final int REFRESH_DELAY = 50;
-	private long lastRefresh = 0;
-	private Thread refreshThread;
-
-	// menus and action items
-	private Action fRefreshAction;
-	private Action fShowPluginsAction;
-	private Action fCollapseAllAction;
-	private Action fShowAdvancedOperationsAction;
-	private Action fGroupByBundlesAction;
-	private Action fGroupByExtensionPointsAction;
-	private Action fGroupByServicesAction;
-	private Action fShowDisabledAction;
-	private Action fCopyAction;
-
-	// advanced actions
-	private Action fStartAction;
-	private Action fStopAction;
-	private Action fEnableAction;
-	private Action fDisableAction;
-	private Action fDiagnoseAction;
-
-	private Clipboard fClipboard;
-
-	private DrillDownAdapter fDrillDownAdapter;
-	private ViewerFilter fActiveFilter = new ViewerFilter() {
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof ExtensionPoint)
-				element = Platform.getBundle(((ExtensionPoint) element).getNamespaceIdentifier());
-			else if (element instanceof Extension)
-				element = Platform.getBundle(((Extension) element).getNamespaceIdentifier());
-			if (element instanceof Bundle)
-				return ((Bundle) element).getState() == Bundle.ACTIVE;
-			return true;
-		}
-	};
-
-	private ViewerFilter fDisabledFilter = new ViewerFilter() {
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof Bundle) {
-				return !((Bundle) element).isEnabled();
-			}
-			return false;
-		}
-	};
-
-	/*
-	 * 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();
-			fShowPluginsAction.setEnabled(!canGoHome());
-			fShowDisabledAction.setEnabled(!canGoHome());
-		}
-
-		public void goBack() {
-			super.goBack();
-			fShowPluginsAction.setEnabled(!canGoHome());
-			fShowDisabledAction.setEnabled(!canGoHome());
-		}
-
-		public void goHome() {
-			super.goHome();
-			fShowPluginsAction.setEnabled(!canGoHome());
-			fShowDisabledAction.setEnabled(!canGoHome());
-		}
-
-		public void goInto(Object newInput) {
-			super.goInto(newInput);
-			fShowPluginsAction.setEnabled(!canGoHome());
-			fShowDisabledAction.setEnabled(!canGoHome());
-		}
-	}
-
-	private void initializeModel() {
-		model = RegistryModelFactory.getRegistryModel("local"); //$NON-NLS-1$
-		fTreeViewer.setInput(model);
-		listener = new RegistryBrowserModelChangeListener(RegistryBrowser.this);
-		model.addModelChangeListener(listener);
-
-		initializeModelJob = new Job(PDERuntimeMessages.RegistryBrowser_InitializingView) {
-			public IStatus run(IProgressMonitor monitor) {
-				model.connect(monitor, true);
-				initializeModelJob = null;
-				return monitor.isCanceled() ? Status.CANCEL_STATUS : Status.OK_STATUS;
-			}
-		};
-		initializeModelJob.schedule();
-	}
-
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-		if (memento == null)
-			this.fMemento = XMLMemento.createWriteRoot("REGISTRYVIEW"); //$NON-NLS-1$
-		else
-			this.fMemento = memento;
-		initializeMemento();
-	}
-
-	private void initializeMemento() {
-		// show all bundles by default (i.e. not just activated ones)
-		if (fMemento.getString(SHOW_RUNNING_PLUGINS) == null)
-			fMemento.putString(SHOW_RUNNING_PLUGINS, "false"); //$NON-NLS-1$
-		if (fMemento.getInteger(GROUP_BY) == null)
-			fMemento.putInteger(GROUP_BY, BUNDLES);
-		if (fMemento.getString(SHOW_DISABLED_MODE) == null)
-			fMemento.putString(SHOW_DISABLED_MODE, "false"); //$NON-NLS-1$
-
-		// default to not showing advanced options to users
-		if (fMemento.getString(SHOW_ADVANCED_MODE) == null)
-			fMemento.putString(SHOW_ADVANCED_MODE, "false"); //$NON-NLS-1$
-	}
-
-	public void dispose() {
-		if (initializeModelJob != null) {
-			initializeModelJob.cancel();
-		}
-
-		model.disconnect();
-		model.removeModelChangeListener(listener);
-		if (fClipboard != null) {
-			fClipboard.dispose();
-		}
-		super.dispose();
-	}
-
-	public void createPartControl(Composite parent) {
-		// create the sash form that will contain the tree viewer & text viewer
-		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_BOTH));
-		makeActions();
-		createTreeViewer(composite);
-		fClipboard = new Clipboard(fTreeViewer.getTree().getDisplay());
-		fillToolBar();
-	}
-
-	private void createTreeViewer(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_BOTH));
-
-		fFilteredTree = new RegistryFilteredTree(this, composite, SWT.MULTI, new PatternFilter());
-
-		fFilteredTree.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-		Tree tree = fFilteredTree.getViewer().getTree();
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		fFilteredTree.setLayoutData(gd);
-		fTreeViewer = fFilteredTree.getViewer();
-		fContentProvider = new RegistryBrowserContentProvider(this);
-		fTreeViewer.setContentProvider(fContentProvider);
-		fLabelProvider = new RegistryBrowserLabelProvider(this);
-		fTreeViewer.setLabelProvider(fLabelProvider);
-		fTreeViewer.setUseHashlookup(true);
-		fTreeViewer.setComparator(new ViewerComparator() {
-			public int compare(Viewer viewer, Object e1, Object e2) {
-				// let Comparables compare themselves
-				if (e1 instanceof Comparable && e2 instanceof Comparable && e1.getClass().equals(e2.getClass())) {
-					Comparable c1 = (Comparable) e1;
-					Comparable c2 = (Comparable) e2;
-
-					return c1.compareTo(c2);
-				}
-
-				if (e1 instanceof Folder && e2 instanceof Folder)
-					return ((Folder) e1).getId() - ((Folder) e2).getId();
-				if (e1 instanceof Bundle && e2 instanceof Bundle) {
-					e1 = ((Bundle) e1).getSymbolicName();
-					e2 = ((Bundle) e2).getSymbolicName();
-				}
-				return super.compare(viewer, e1, e2);
-			}
-		});
-		if (fShowPluginsAction.isChecked())
-			fTreeViewer.addFilter(fActiveFilter);
-
-		if (fShowDisabledAction.isChecked())
-			fTreeViewer.addFilter(fDisabledFilter);
-
-		initializeModel();
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(fTreeViewer.getControl(), IHelpContextIds.REGISTRY_VIEW);
-
-		getViewSite().setSelectionProvider(fTreeViewer);
-
-		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);
-	}
-
-	private void fillToolBar() {
-		fDrillDownAdapter = new RegistryDrillDownAdapter(fTreeViewer);
-		IActionBars bars = getViewSite().getActionBars();
-		bars.setGlobalActionHandler(ActionFactory.COPY.getId(), fCopyAction);
-		IToolBarManager mng = bars.getToolBarManager();
-		fDrillDownAdapter.addNavigationActions(mng);
-		mng.add(fRefreshAction);
-		mng.add(new Separator());
-		mng.add(fCollapseAllAction);
-		IMenuManager mgr = bars.getMenuManager();
-		IMenuManager manager = new MenuManager(PDERuntimeMessages.RegistryBrowser_GroupBy);
-		manager.add(fGroupByBundlesAction);
-		manager.add(fGroupByExtensionPointsAction);
-		manager.add(fGroupByServicesAction);
-		mgr.add(manager);
-		mgr.add(new Separator());
-		mgr.add(fShowPluginsAction);
-		mgr.add(fShowDisabledAction);
-		mgr.add(new Separator());
-		mgr.add(fShowAdvancedOperationsAction);
-
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(fRefreshAction);
-		manager.add(new Separator());
-		manager.add(fCopyAction);
-		manager.add(new Separator());
-		fDrillDownAdapter.addNavigationActions(manager);
-		manager.add(new Separator());
-		// check if we should enable advanced actions
-		if (fShowAdvancedOperationsAction.isChecked() && isBundleSelected()) {
-			// control bundle state actions
-			if (selectedBundlesStopped())
-				manager.add(fStartAction);
-			if (selectedBundlesStarted())
-				manager.add(fStopAction);
-
-			if (getSelectedBundles().size() == 1)
-				manager.add(fDiagnoseAction);
-
-			// security related actions
-			if (selectedBundlesDisabled())
-				manager.add(fEnableAction);
-			if (selectedBundlesEnabled())
-				manager.add(fDisableAction);
-		}
-
-		manager.add(new Separator());
-		manager.add(fShowPluginsAction);
-		manager.add(fShowDisabledAction);
-		manager.add(new Separator());
-		manager.add(fShowAdvancedOperationsAction);
-	}
-
-	public void saveState(IMemento memento) {
-		if (memento == null || fMemento == null || fTreeViewer == null)
-			return;
-		fMemento.putString(SHOW_RUNNING_PLUGINS, Boolean.toString(fShowPluginsAction.isChecked()));
-		fMemento.putString(SHOW_DISABLED_MODE, Boolean.toString(fShowDisabledAction.isChecked()));
-		fMemento.putBoolean(SHOW_ADVANCED_MODE, fShowAdvancedOperationsAction.isChecked());
-		memento.putMemento(fMemento);
-	}
-
-	public void setFocus() {
-		Text filterText = fFilteredTree.getFilterControl();
-		if (filterText != null) {
-			filterText.setFocus();
-		}
-	}
-
-	/*
-	 * toolbar and context menu actions
-	 */
-	private void makeActions() {
-		fRefreshAction = new Action("refresh") { //$NON-NLS-1$
-			public void run() {
-				BusyIndicator.showWhile(fTreeViewer.getTree().getDisplay(), new Runnable() {
-					public void run() {
-						refresh(fTreeViewer.getInput());
-					}
-				});
-			}
-		};
-		fRefreshAction.setText(PDERuntimeMessages.RegistryView_refresh_label);
-		fRefreshAction.setToolTipText(PDERuntimeMessages.RegistryView_refresh_tooltip);
-		fRefreshAction.setImageDescriptor(PDERuntimePluginImages.DESC_REFRESH);
-		fRefreshAction.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_REFRESH_DISABLED);
-
-		fShowPluginsAction = new Action(PDERuntimeMessages.RegistryView_showRunning_label) {
-			public void run() {
-				if (fShowPluginsAction.isChecked()) {
-					fTreeViewer.addFilter(fActiveFilter);
-				} else {
-					fTreeViewer.removeFilter(fActiveFilter);
-				}
-				updateTitle();
-			}
-		};
-		fShowPluginsAction.setChecked(fMemento.getString(SHOW_RUNNING_PLUGINS).equals("true")); //$NON-NLS-1$
-
-		fShowDisabledAction = new Action(PDERuntimeMessages.RegistryView_showDisabled_label) {
-			public void run() {
-				if (fShowDisabledAction.isChecked()) {
-					fTreeViewer.addFilter(fDisabledFilter);
-				} else {
-					fTreeViewer.removeFilter(fDisabledFilter);
-				}
-				updateTitle();
-			}
-		};
-		fShowDisabledAction.setChecked(fMemento.getString(SHOW_DISABLED_MODE).equals("true")); //$NON-NLS-1$
-
-		fCopyAction = new Action(PDERuntimeMessages.RegistryBrowser_copy_label) {
-			public void run() {
-				ITreeSelection selection = (ITreeSelection) fFilteredTree.getViewer().getSelection();
-				if (selection.isEmpty()) {
-					return;
-				}
-
-				String textVersion = ((ILabelProvider) fTreeViewer.getLabelProvider()).getText(selection.getFirstElement());
-				if ((textVersion != null) && (textVersion.trim().length() > 0)) {
-					// set the clipboard contents
-					fClipboard.setContents(new Object[] {textVersion}, new Transfer[] {TextTransfer.getInstance()});
-				}
-			}
-		};
-		fCopyAction.setImageDescriptor(PDERuntimePluginImages.COPY_QNAME);
-
-		fGroupByBundlesAction = new GroupByAction(PDERuntimeMessages.RegistryBrowser_Bundle, BUNDLES);
-		int groupBy = getGroupBy();
-		fGroupByBundlesAction.setChecked(groupBy == BUNDLES);
-		fGroupByExtensionPointsAction = new GroupByAction(PDERuntimeMessages.RegistryBrowser_ExtensionPoint, EXTENSION_REGISTRY);
-		fGroupByExtensionPointsAction.setChecked(groupBy == EXTENSION_REGISTRY);
-		fGroupByServicesAction = new GroupByAction(PDERuntimeMessages.RegistryBrowser_Service, SERVICES);
-		fGroupByServicesAction.setChecked(groupBy == SERVICES);
-
-		fShowAdvancedOperationsAction = new Action(PDERuntimeMessages.RegistryView_showAdvanced_label) {
-			public void run() { // do nothing
-			}
-		};
-		fShowAdvancedOperationsAction.setChecked(fMemento.getString(SHOW_ADVANCED_MODE).equals("true")); //$NON-NLS-1$
-
-		fStartAction = new Action(PDERuntimeMessages.RegistryView_startAction_label) {
-			public void run() {
-				try {
-					List bundles = getSelectedBundles();
-					for (Iterator it = bundles.iterator(); it.hasNext();) {
-						Bundle bundle = (Bundle) it.next();
-						bundle.start();
-					}
-				} catch (BundleException e) {
-					PDERuntimePlugin.log(e);
-				}
-			}
-		};
-
-		fStopAction = new Action(PDERuntimeMessages.RegistryView_stopAction_label) {
-			public void run() {
-				try {
-					List bundles = getSelectedBundles();
-					for (Iterator it = bundles.iterator(); it.hasNext();) {
-						Bundle bundle = (Bundle) it.next();
-						bundle.stop();
-					}
-				} catch (BundleException e) {
-					PDERuntimePlugin.log(e);
-				}
-			}
-		};
-
-		fEnableAction = new Action(PDERuntimeMessages.RegistryView_enableAction_label) {
-			public void run() {
-				List bundles = getSelectedBundles();
-				for (Iterator it = bundles.iterator(); it.hasNext();) {
-					Bundle bundle = (Bundle) it.next();
-					bundle.enable();
-				}
-			}
-		};
-
-		fDisableAction = new Action(PDERuntimeMessages.RegistryView_disableAction_label) {
-			public void run() {
-				List bundles = getSelectedBundles();
-				for (Iterator it = bundles.iterator(); it.hasNext();) {
-					Bundle bundle = (Bundle) it.next();
-					bundle.disable();
-				}
-			}
-		};
-
-		fDiagnoseAction = new Action(PDERuntimeMessages.RegistryView_diagnoseAction_label) {
-			public void run() {
-				List bundles = getSelectedBundles();
-				for (Iterator it = bundles.iterator(); it.hasNext();) {
-					Bundle bundle = (Bundle) it.next();
-					MultiStatus problems = bundle.diagnose();
-
-					Dialog dialog;
-					if ((problems != null) && (problems.getChildren().length > 0)) {
-						dialog = new DiagnosticsDialog(getSite().getShell(), PDERuntimeMessages.RegistryView_diag_dialog_title, null, problems, IStatus.WARNING);
-						dialog.open();
-					} else {
-						MessageDialog.openInformation(getSite().getShell(), PDERuntimeMessages.RegistryView_diag_dialog_title, PDERuntimeMessages.RegistryView_no_unresolved_constraints);
-					}
-
-				}
-			}
-		};
-
-		fCollapseAllAction = new Action("collapseAll") { //$NON-NLS-1$
-			public void run() {
-				fTreeViewer.collapseAll();
-			}
-		};
-		fCollapseAllAction.setText(PDERuntimeMessages.RegistryView_collapseAll_label);
-		fCollapseAllAction.setImageDescriptor(PDERuntimePluginImages.DESC_COLLAPSE_ALL);
-		fCollapseAllAction.setToolTipText(PDERuntimeMessages.RegistryView_collapseAll_tooltip);
-	}
-
-	public int getGroupBy() {
-		return fMemento.getInteger(GROUP_BY).intValue();
-	}
-
-	public void updateTitle() {
-		setContentDescription(getTitleSummary());
-	}
-
-	protected Tree getUndisposedTree() {
-		if (fTreeViewer == null || fTreeViewer.getTree() == null || fTreeViewer.getTree().isDisposed())
-			return null;
-		return fTreeViewer.getTree();
-	}
-
-	public String getTitleSummary() {
-		Tree tree = getUndisposedTree();
-		String type;
-		int total = 0;
-		switch (getGroupBy()) {
-			default :
-			case BUNDLES :
-				type = PDERuntimeMessages.RegistryBrowser_plugins;
-				total = model.getBundles().length;
-				break;
-			case EXTENSION_REGISTRY :
-				type = PDERuntimeMessages.RegistryBrowser_extensionPoints;
-				total = model.getExtensionPoints().length;
-				break;
-			case SERVICES :
-				type = PDERuntimeMessages.RegistryBrowser_Services;
-				total = model.getServiceNames().length;
-				break;
-		}
-
-		if (tree == null)
-			return NLS.bind(PDERuntimeMessages.RegistryView_titleSummary, (new String[] {"0", "0", type})); //$NON-NLS-1$ //$NON-NLS-2$
-		return NLS.bind(PDERuntimeMessages.RegistryView_titleSummary, (new String[] {Integer.toString(tree.getItemCount()), Integer.toString(total), type}));
-	}
-
-	private boolean isBundleSelected() {
-		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
-		if (selection != null) {
-			Object[] elements = selection.toArray();
-			for (int i = 0; i < elements.length; i++) {
-				if (!(elements[i] instanceof Bundle)) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private List getSelectedBundles() {
-		List bundles = new ArrayList();
-		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
-		if (selection != null) {
-			Object[] elements = selection.toArray();
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof Bundle) {
-					bundles.add(elements[i]);
-				}
-			}
-		}
-		return bundles;
-	}
-
-	/**
-	 * @return true if none is stopped, false if at least one is stopped
-	 */
-	private boolean selectedBundlesStarted() {
-		List bundles = getSelectedBundles();
-		for (Iterator it = bundles.iterator(); it.hasNext();) {
-			Bundle bundle = (Bundle) it.next();
-			if (bundle.getState() != Bundle.ACTIVE)
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return true if none is active, false if at least one is active
-	 */
-	private boolean selectedBundlesStopped() {
-		List bundles = getSelectedBundles();
-		for (Iterator it = bundles.iterator(); it.hasNext();) {
-			Bundle bundle = (Bundle) it.next();
-			if (bundle.getState() == Bundle.ACTIVE)
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return true if none is enabled, false if at least one is enabled
-	 */
-	private boolean selectedBundlesDisabled() {
-		List bundles = getSelectedBundles();
-		for (Iterator it = bundles.iterator(); it.hasNext();) {
-			Bundle bundle = (Bundle) it.next();
-			if (bundle.isEnabled())
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return true if none is disabled, false if at least one is disabled
-	 */
-	private boolean selectedBundlesEnabled() {
-		List bundles = getSelectedBundles();
-		for (Iterator it = bundles.iterator(); it.hasNext();) {
-			Bundle bundle = (Bundle) it.next();
-			if (!bundle.isEnabled())
-				return false;
-		}
-		return true;
-	}
-
-	public void add(Object object) {
-		Object parent = fContentProvider.getParent(object);
-		if (parent == null) {
-			add(fTreeViewer.getInput(), object);
-		} else {
-			refresh(parent);
-		}
-	}
-
-	protected void add(Object parent, Object object) {
-		if (fTreeViewer.getTree().isDisposed())
-			return;
-
-		if (fDrillDownAdapter.canGoHome())
-			return;
-		fTreeViewer.add(parent, object);
-		updateTitle();
-	}
-
-	public void remove(Object object) {
-		if (fTreeViewer.getTree().isDisposed())
-			return;
-
-		if (fDrillDownAdapter.canGoHome())
-			return;
-		fTreeViewer.remove(object);
-		updateTitle();
-	}
-
-	private boolean filtersEnabled() {
-		return fTreeViewer.getFilters().length > 0;
-	}
-
-	private void deferredRefresh() {
-		if (refreshThread != null)
-			return;
-
-		long now = System.currentTimeMillis();
-		if (now - lastRefresh > REFRESH_DELAY) {
-			fTreeViewer.refresh();
-			updateTitle();
-			lastRefresh = now;
-		} else {
-			Runnable runnable = new Runnable() {
-				public void run() {
-					try {
-						Thread.sleep(REFRESH_DELAY);
-					} catch (InterruptedException e) {
-						return;
-					}
-					refreshThread = null;
-					if (fTreeViewer.getTree().isDisposed())
-						return;
-
-					fTreeViewer.getTree().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							if (!fTreeViewer.getTree().isDisposed()) {
-								fTreeViewer.refresh();
-								updateTitle();
-							}
-						}
-					});
-				}
-			};
-			refreshThread = new Thread(runnable);
-			refreshThread.start();
-		}
-	}
-
-	void refresh(Object[] objects) {
-		if (fTreeViewer.getTree().isDisposed())
-			return;
-
-		if (filtersEnabled()) {
-			deferredRefresh();
-		} else {
-			for (int i = 0; i < objects.length; i++) {
-				fTreeViewer.refresh(objects[i]);
-			}
-		}
-		updateTitle();
-	}
-
-	void refresh(Object object) {
-		if (fTreeViewer.getTree().isDisposed())
-			return;
-
-		if (filtersEnabled()) {
-			deferredRefresh();
-		} else {
-			fTreeViewer.refresh(object);
-			updateTitle();
-		}
-	}
-
-	public Object getAdapter(Class clazz) {
-		if (ILabelProvider.class.equals(clazz)) {
-			return fLabelProvider;
-		}
-
-		if (IContentProvider.class.equals(clazz)) {
-			return fContentProvider;
-		}
-
-		return super.getAdapter(clazz);
-	}
-}

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 8b1004d..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Wolfgang Schell <ws@jetztgrad.net> - bug 259348
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.registry;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.runtime.registry.model.*;
-
-public class RegistryBrowserContentProvider implements ITreeContentProvider {
-
-	public boolean isInExtensionSet;
-
-	private RegistryBrowser fRegistryBrowser;
-
-	public RegistryBrowserContentProvider(RegistryBrowser registryBrowser) {
-		fRegistryBrowser = registryBrowser;
-	}
-
-	public void dispose() { // nothing to dispose
-	}
-
-	public Object[] getElements(Object element) {
-		return getChildren(element);
-	}
-
-	public Object[] getChildren(Object element) {
-		if (element instanceof RegistryModel) {
-			RegistryModel model = (RegistryModel) element;
-
-			switch (fRegistryBrowser.getGroupBy()) {
-				case (RegistryBrowser.BUNDLES) :
-					return model.getBundles();
-				case (RegistryBrowser.EXTENSION_REGISTRY) :
-					return model.getExtensionPoints();
-				case (RegistryBrowser.SERVICES) :
-					return model.getServiceNames();
-			}
-
-			return null;
-		}
-
-		if (element instanceof Extension)
-			return ((Extension) element).getConfigurationElements();
-
-		isInExtensionSet = false;
-		if (element instanceof ExtensionPoint)
-			return ((ExtensionPoint) element).getExtensions().toArray();
-
-		if (element instanceof ConfigurationElement)
-			return ((ConfigurationElement) element).getElements();
-
-		if (element instanceof Bundle) {
-			if (fRegistryBrowser.getGroupBy() != RegistryBrowser.BUNDLES) // expands only in Bundles mode
-				return null;
-
-			Bundle bundle = (Bundle) element;
-
-			List folders = new ArrayList(9);
-
-			folders.add(new Attribute(Attribute.F_LOCATION, bundle.getLocation()));
-			if (bundle.getImports().length > 0)
-				folders.add(new Folder(Folder.F_IMPORTS, bundle));
-			if (bundle.getImportedPackages().length > 0)
-				folders.add(new Folder(Folder.F_IMPORTED_PACKAGES, bundle));
-			if (bundle.getExportedPackages().length > 0)
-				folders.add(new Folder(Folder.F_EXPORTED_PACKAGES, bundle));
-			if (bundle.getLibraries().length > 0)
-				folders.add(new Folder(Folder.F_LIBRARIES, bundle));
-			if (bundle.getExtensionPoints().length > 0)
-				folders.add(new Folder(Folder.F_EXTENSION_POINTS, bundle));
-			if (bundle.getExtensions().length > 0)
-				folders.add(new Folder(Folder.F_EXTENSIONS, bundle));
-			if (bundle.getRegisteredServices().length > 0)
-				folders.add(new Folder(Folder.F_REGISTERED_SERVICES, bundle));
-			if (bundle.getServicesInUse().length > 0)
-				folders.add(new Folder(Folder.F_SERVICES_IN_USE, bundle));
-			if (bundle.getFragments().length > 0)
-				folders.add(new Folder(Folder.F_FRAGMENTS, bundle));
-
-			return folders.toArray();
-		}
-
-		isInExtensionSet = false;
-
-		if (element instanceof Folder) {
-			Folder folder = (Folder) element;
-			isInExtensionSet = folder.getId() == Folder.F_EXTENSIONS;
-			ModelObject[] objs = folder.getChildren();
-			if (folder.getId() == Folder.F_USING_BUNDLES) {
-				ModelObject[] result = new ModelObject[objs.length];
-				ILabelProvider labelProvider = (ILabelProvider) fRegistryBrowser.getAdapter(ILabelProvider.class);
-
-				for (int i = 0; i < objs.length; i++) {
-					result[i] = new Attribute(Attribute.F_BUNDLE, labelProvider.getText(objs[i]));
-				}
-
-				objs = result;
-			}
-			return objs;
-		}
-		if (element instanceof ConfigurationElement) {
-			return ((ConfigurationElement) element).getElements();
-		}
-
-		if (element instanceof ExtensionPoint) {
-			ExtensionPoint extensionPoint = (ExtensionPoint) element;
-			Object[] objs = extensionPoint.getExtensions().toArray();
-			return objs;
-		}
-
-		if (element instanceof ServiceName) {
-			return ((ServiceName) element).getChildren();
-		}
-
-		if (element instanceof ServiceRegistration) {
-			ServiceRegistration service = (ServiceRegistration) element;
-
-			List folders = new ArrayList();
-
-			if (service.getProperties().length > 0)
-				folders.add(new Folder(Folder.F_PROPERTIES, service));
-			if (service.getUsingBundleIds().length > 0)
-				folders.add(new Folder(Folder.F_USING_BUNDLES, service));
-
-			return folders.toArray();
-		}
-
-		if (element instanceof Object[]) {
-			return (Object[]) element;
-		}
-
-		return null;
-	}
-
-	public Object getParent(Object element) {
-		if (!(element instanceof ModelObject)) {
-			return null;
-		}
-
-		if (element instanceof Folder) {
-			return ((Folder) element).getParent();
-		}
-
-		return null;
-	}
-
-	public boolean hasChildren(Object element) {
-		// Bundle and ServiceRegistration always have children
-		if (element instanceof Bundle)
-			return true;
-		if (element instanceof ServiceRegistration)
-			return true;
-
-		Object[] children = getChildren(element);
-		return children != null && children.length > 0;
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // do nothing
-	}
-
-}

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 5516caf..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java
+++ /dev/null

@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.pde.internal.runtime.PDERuntimeMessages;
-
-import java.util.Arrays;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.pde.internal.runtime.registry.model.*;
-import org.eclipse.swt.graphics.Image;
-import org.osgi.framework.Constants;
-
-public class RegistryBrowserLabelProvider extends StyledCellLabelProvider implements ILabelProvider {
-
-	private Image fPluginImage;
-	private Image fActivePluginImage;
-	private Image fUnresolvedPluginImage;
-	private Image fLibraryImage;
-	private Image fRuntimeImage;
-	private Image fGenericTagImage;
-	private Image fGenericAttrImage;
-	private Image fExtensionImage;
-	private Image fExtensionsImage;
-	private Image fExtensionPointImage;
-	private Image fExtensionPointsImage;
-	private Image fRequiresImage;
-	private Image fExpReqPluginImage;
-	private Image fReqPluginImage;
-	private Image fPluginsImage;
-	private Image fLocationImage;
-	private Image fDisabledImage;
-	private Image fExporterImage;
-	private Image fImporterImage;
-	private Image fServiceImage;
-	private Image fPropertyImage;
-	private Image fServicePropertyImage;
-	private Image fFragmentImage;
-	private Image fPackageImage;
-	private RegistryBrowser fRegistryBrowser;
-
-	public RegistryBrowserLabelProvider(RegistryBrowser browser) {
-		fRegistryBrowser = browser;
-		fPluginImage = PDERuntimePluginImages.DESC_PLUGIN_OBJ.createImage();
-		fReqPluginImage = PDERuntimePluginImages.DESC_REQ_PLUGIN_OBJ.createImage();
-		fExtensionPointImage = PDERuntimePluginImages.DESC_EXT_POINT_OBJ.createImage();
-		fExtensionPointsImage = PDERuntimePluginImages.DESC_EXT_POINTS_OBJ.createImage();
-		fExtensionImage = PDERuntimePluginImages.DESC_EXTENSION_OBJ.createImage();
-		fExtensionsImage = PDERuntimePluginImages.DESC_EXTENSIONS_OBJ.createImage();
-		fRequiresImage = PDERuntimePluginImages.DESC_REQ_PLUGINS_OBJ.createImage();
-		fLibraryImage = PDERuntimePluginImages.DESC_JAVA_LIB_OBJ.createImage();
-		fGenericTagImage = PDERuntimePluginImages.DESC_GENERIC_XML_OBJ.createImage();
-		fGenericAttrImage = PDERuntimePluginImages.DESC_ATTR_XML_OBJ.createImage();
-		fRuntimeImage = PDERuntimePluginImages.DESC_RUNTIME_OBJ.createImage();
-		fLocationImage = PDERuntimePluginImages.DESC_LOCATION.createImage();
-		fExporterImage = PDERuntimePluginImages.DESC_EXP_OBJ.createImage();
-		fImporterImage = PDERuntimePluginImages.DESC_IMP_OBJ.createImage();
-		fServiceImage = PDERuntimePluginImages.DESC_SERVICE_OBJ.createImage();
-		fPropertyImage = PDERuntimePluginImages.DESC_PROPERTY_OBJ.createImage();
-		fPluginsImage = PDERuntimePluginImages.DESC_PLUGINS_OBJ.createImage();
-		fFragmentImage = PDERuntimePluginImages.DESC_FRAGMENT_OBJ.createImage();
-		fPackageImage = PDERuntimePluginImages.DESC_PACKAGE_OBJ.createImage();
-
-		ImageDescriptor activePluginDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_RUN_CO}});
-		fActivePluginImage = activePluginDesc.createImage();
-
-		ImageDescriptor disabledPluginDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_ERROR_CO}});
-		fDisabledImage = disabledPluginDesc.createImage();
-
-		ImageDescriptor unresolvedPluginDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_ERROR_CO}});
-		fUnresolvedPluginImage = unresolvedPluginDesc.createImage();
-
-		ImageDescriptor exportedRequiresDesc = new OverlayIcon(PDERuntimePluginImages.DESC_REQ_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_EXPORT_CO}});
-		fExpReqPluginImage = exportedRequiresDesc.createImage();
-
-		ImageDescriptor servicePropertyDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PROPERTY_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_DEFAULT_CO}});
-		fServicePropertyImage = servicePropertyDesc.createImage();
-
-	}
-
-	public void dispose() {
-		fPluginImage.dispose();
-		fActivePluginImage.dispose();
-		fUnresolvedPluginImage.dispose();
-		fReqPluginImage.dispose();
-		fExtensionPointImage.dispose();
-		fExtensionPointsImage.dispose();
-		fExtensionImage.dispose();
-		fExtensionsImage.dispose();
-		fRequiresImage.dispose();
-		fExpReqPluginImage.dispose();
-		fLibraryImage.dispose();
-		fGenericTagImage.dispose();
-		fGenericAttrImage.dispose();
-		fRuntimeImage.dispose();
-		fLocationImage.dispose();
-		fDisabledImage.dispose();
-		fImporterImage.dispose();
-		fExporterImage.dispose();
-		fServiceImage.dispose();
-		fPropertyImage.dispose();
-		fServicePropertyImage.dispose();
-		fPluginsImage.dispose();
-		fFragmentImage.dispose();
-		fPackageImage.dispose();
-	}
-
-	public Image getImage(Object element) {
-		if (element instanceof Bundle) {
-			Bundle bundle = (Bundle) element;
-
-			if (bundle.getFragmentHost() != null)
-				return fFragmentImage;
-
-			if (!bundle.isEnabled())
-				return fDisabledImage;
-
-			switch (bundle.getState()) {
-				case Bundle.ACTIVE :
-					return fActivePluginImage;
-				case Bundle.UNINSTALLED :
-					return fUnresolvedPluginImage;
-				case Bundle.INSTALLED :
-					if (!bundle.isEnabled())
-						return fUnresolvedPluginImage;
-				default :
-					return fPluginImage;
-			}
-		}
-
-		if (element instanceof ServiceName) {
-			return fServiceImage;
-		}
-
-		if (element instanceof ServiceRegistration) {
-			return fPluginImage;
-		}
-
-		if (element instanceof Property) {
-			Property property = (Property) element;
-			// special handling for property objectClass
-			if (property.getName().equals(Constants.OBJECTCLASS)) {
-				return PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_CLASS_OBJ);
-			}
-			// special handling for builtin service properties
-			if (property.getName().startsWith("service.") || property.getName().startsWith("component.")) { //$NON-NLS-1$ //$NON-NLS-2$
-				return fServicePropertyImage;
-			}
-			return fPropertyImage;
-		}
-
-		if (element instanceof Folder) {
-			int id = ((Folder) element).getId();
-			switch (id) {
-				case Folder.F_EXTENSIONS :
-					return fExtensionsImage;
-				case Folder.F_EXTENSION_POINTS :
-					return fExtensionPointsImage;
-				case Folder.F_IMPORTS :
-					return fRequiresImage;
-				case Folder.F_LIBRARIES :
-					return fRuntimeImage;
-				case Folder.F_REGISTERED_SERVICES :
-					return fExporterImage;
-				case Folder.F_SERVICES_IN_USE :
-					return fImporterImage;
-				case Folder.F_PROPERTIES :
-					return fPropertyImage;
-				case Folder.F_USING_BUNDLES :
-					return fPluginsImage;
-				case Folder.F_FRAGMENTS :
-					return fPluginsImage;
-				case Folder.F_EXPORTED_PACKAGES :
-				case Folder.F_IMPORTED_PACKAGES :
-					return fPackageImage;
-			}
-			return null;
-		}
-
-		if (element instanceof Extension)
-			return fExtensionImage;
-
-		if (element instanceof ExtensionPoint)
-			return fExtensionPointImage;
-
-		if (element instanceof BundlePrerequisite) {
-			BundlePrerequisite prereq = (BundlePrerequisite) element;
-
-			if (prereq.isPackage())
-				return fPackageImage;
-
-			return prereq.isExported() ? fExpReqPluginImage : fReqPluginImage;
-		}
-
-		if (element instanceof BundleLibrary)
-			return fLibraryImage;
-
-		if (element instanceof ConfigurationElement)
-			return fGenericTagImage;
-
-		if (element instanceof Attribute) {
-			Attribute attr = (Attribute) element;
-			if (Attribute.F_LOCATION.equals(attr.getName())) {
-				return fLocationImage;
-			}
-			if (Attribute.F_BUNDLE.equals(attr.getName())) {
-				return fPluginImage;
-			}
-			return fGenericAttrImage;
-		}
-
-		return null;
-	}
-
-	protected StyledString getStyledText(Object element) {
-
-		if (element instanceof Bundle) {
-			Bundle bundle = ((Bundle) element);
-
-			StyledString sb = new StyledString(bundle.getSymbolicName());
-			String version = bundle.getVersion();
-			if (version != null) {
-				sb.append(" (", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ 
-				sb.append(version, StyledString.DECORATIONS_STYLER);
-				sb.append(")", StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-			}
-			String host = bundle.getFragmentHost();
-			if (host != null) {
-				sb.append(" [", StyledString.QUALIFIER_STYLER); //$NON-NLS-1$
-				sb.append(host, StyledString.QUALIFIER_STYLER);
-				sb.append("]", StyledString.QUALIFIER_STYLER); //$NON-NLS-1$
-			}
-			return sb;
-		}
-
-		if (element instanceof ServiceRegistration) {
-			ServiceRegistration ref = (ServiceRegistration) element;
-			String identifier = " (id=" + ref.getId() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-
-			StyledString ss = new StyledString();
-			if (fRegistryBrowser.getGroupBy() == RegistryBrowser.BUNDLES) {
-				String[] classes = ref.getName().getClasses();
-				ss.append(Arrays.asList(classes).toString());
-
-			} else {
-				ss.append(PDERuntimeMessages.RegistryBrowserLabelProvider_RegisteredBy);
-				ss.append(ref.getBundle());
-			}
-
-			ss.append(identifier, StyledString.DECORATIONS_STYLER);
-
-			return ss;
-		}
-
-		if (element instanceof ServiceName) {
-			return new StyledString(Arrays.asList(((ServiceName) element).getClasses()).toString());
-		}
-
-		if (element instanceof Folder) {
-			String text = null;
-			switch (((Folder) element).getId()) {
-				case Folder.F_IMPORTS :
-					text = PDERuntimeMessages.RegistryView_folders_imports;
-					break;
-				case Folder.F_IMPORTED_PACKAGES :
-					text = PDERuntimeMessages.RegistryBrowserLabelProvider_ImportedPackages;
-					break;
-				case Folder.F_EXPORTED_PACKAGES :
-					text = PDERuntimeMessages.RegistryBrowserLabelProvider_ExportedPackages;
-					break;
-				case Folder.F_LIBRARIES :
-					text = PDERuntimeMessages.RegistryView_folders_libraries;
-					break;
-				case Folder.F_EXTENSION_POINTS :
-					text = PDERuntimeMessages.RegistryView_folders_extensionPoints;
-					break;
-				case Folder.F_EXTENSIONS :
-					text = PDERuntimeMessages.RegistryView_folders_extensions;
-					break;
-				case Folder.F_REGISTERED_SERVICES :
-					text = PDERuntimeMessages.RegistryBrowserLabelProvider_registeredServices;
-					break;
-				case Folder.F_SERVICES_IN_USE :
-					text = PDERuntimeMessages.RegistryBrowserLabelProvider_usedServices;
-					break;
-				case Folder.F_PROPERTIES :
-					text = PDERuntimeMessages.RegistryBrowserLabelProvider_Properties;
-					break;
-				case Folder.F_USING_BUNDLES :
-					text = PDERuntimeMessages.RegistryBrowserLabelProvider_UsingBundles;
-					break;
-				case Folder.F_FRAGMENTS :
-					text = PDERuntimeMessages.RegistryBrowserLabelProvider_Fragments;
-					break;
-			}
-
-			if (text != null) {
-				return new StyledString(text);
-			}
-		}
-		if (element instanceof Extension) {
-			if (((RegistryBrowserContentProvider) fRegistryBrowser.getAdapter(IContentProvider.class)).isInExtensionSet) {
-				Extension extension = ((Extension) element);
-
-				StyledString ss = new StyledString(extension.getExtensionPointUniqueIdentifier());
-				String name = extension.getLabel();
-				if (name != null && name.length() > 0) {
-					ss.append("[ ", StyledString.QUALIFIER_STYLER); //$NON-NLS-1$
-					ss.append(name, StyledString.QUALIFIER_STYLER);
-					ss.append(']', StyledString.QUALIFIER_STYLER);
-				}
-
-				return ss;
-			}
-
-			String contributor = ((Extension) element).getNamespaceIdentifier();
-			return new StyledString(NLS.bind(PDERuntimeMessages.RegistryBrowserLabelProvider_contributedBy, contributor));
-
-		}
-		if (element instanceof ExtensionPoint) {
-			ExtensionPoint extPoint = (ExtensionPoint) element;
-
-			StyledString ss = new StyledString(extPoint.getUniqueIdentifier());
-			String name = extPoint.getLabel();
-			if (name != null && name.length() > 0) {
-				ss.append(" [", StyledString.QUALIFIER_STYLER); //$NON-NLS-1$
-				ss.append(name, StyledString.QUALIFIER_STYLER);
-				ss.append(']', StyledString.QUALIFIER_STYLER);
-			}
-
-			return ss;
-		}
-		if (element instanceof BundlePrerequisite) {
-			BundlePrerequisite prereq = (BundlePrerequisite) element;
-
-			StyledString ss = new StyledString(prereq.getName());
-
-			String version = prereq.getVersion();
-			if (version != null) {
-				if (Character.isDigit(version.charAt(0)))
-					version = '(' + version + ')';
-				ss.append(' ').append(version, StyledString.DECORATIONS_STYLER);
-			}
-
-			return ss;
-		}
-
-		if (element instanceof BundleLibrary) {
-			return new StyledString(((BundleLibrary) element).getLibrary());
-		}
-
-		if (element instanceof ConfigurationElement) {
-			return new StyledString(((ConfigurationElement) element).getName());
-		}
-		if (element instanceof Attribute) {
-			Attribute attribute = (Attribute) element;
-			if (Attribute.F_BUNDLE.equals(attribute.getName())) {
-				return new StyledString(attribute.getValue());
-			}
-
-			return new StyledString(attribute.getName() + " = " + attribute.getValue()); //$NON-NLS-1$
-		}
-		if (element instanceof Property) {
-			Property property = (Property) element;
-			return new StyledString(property.getName() + " = " + property.getValue()); //$NON-NLS-1$
-		}
-
-		return new StyledString(element == null ? "" : element.toString()); //$NON-NLS-1$
-	}
-
-	public void update(ViewerCell cell) {
-		StyledString string = getStyledText(cell.getElement());
-		cell.setText(string.getString());
-		cell.setStyleRanges(string.getStyleRanges());
-		cell.setImage(getImage(cell.getElement()));
-		super.update(cell);
-	}
-
-	public String getText(Object element) {
-		return getStyledText(element).getString();
-	}
-}

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

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.pde.internal.runtime.registry.model.*;
-
-public class RegistryBrowserModelChangeListener implements ModelChangeListener {
-
-	private RegistryBrowser fRegistryBrowser;
-
-	public RegistryBrowserModelChangeListener(RegistryBrowser registryBrowser) {
-		fRegistryBrowser = registryBrowser;
-	}
-
-	public void modelChanged(final ModelChangeDelta[] delta) {
-		fRegistryBrowser.getSite().getWorkbenchWindow().getWorkbench().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				update(delta);
-			}
-		});
-	}
-
-	private boolean topLevelElement(Object object) {
-		switch (fRegistryBrowser.getGroupBy()) {
-			case (RegistryBrowser.BUNDLES) :
-				return object instanceof Bundle;
-			case (RegistryBrowser.EXTENSION_REGISTRY) :
-				return object instanceof ExtensionPoint;
-			case (RegistryBrowser.SERVICES) :
-				return object instanceof ServiceName;
-		}
-
-		return false;
-	}
-
-	/**
-	 * TODO FIXME this should be moved to content provider getParent
-	 * 
-	 * @param object
-	 * @return if returns array, then appears under all top level elements of that array
-	 */
-	private Object getTopLevelElement(Object object) {
-		if (fRegistryBrowser.getGroupBy() == RegistryBrowser.BUNDLES) {
-			if (object instanceof Bundle) {
-				return object;
-			} else if (object instanceof ExtensionPoint) {
-				ExtensionPoint ext = (ExtensionPoint) object;
-				return ext.getContributor();
-			} else if (object instanceof Extension) {
-				Extension ext = (Extension) object;
-				return ext.getContributor();
-			} else if (object instanceof ServiceRegistration) {
-				ServiceRegistration reg = (ServiceRegistration) object;
-
-				Bundle[] bundles = reg.getUsingBundles();
-				if (bundles.length == 0) {
-					return reg.getBundle();
-				}
-
-				Object[] result = new Object[bundles.length + 1];
-				result[0] = reg.getBundle();
-				System.arraycopy(bundles, 0, result, 1, bundles.length);
-
-				return result;
-			}
-		} else if (fRegistryBrowser.getGroupBy() == RegistryBrowser.EXTENSION_REGISTRY) {
-			if (object instanceof ExtensionPoint) {
-				return object;
-			} else if (object instanceof Extension) {
-				Extension ext = (Extension) object;
-				return ext.getExtensionPoint();
-			}
-		} else if (fRegistryBrowser.getGroupBy() == RegistryBrowser.SERVICES) {
-			if (object instanceof ServiceRegistration) {
-				ServiceRegistration service = (ServiceRegistration) object;
-				return service.getName();
-			} else if (object instanceof Bundle) {
-				Object[] services = ((Bundle) object).getServicesInUse();
-				for (int i = 0; i < services.length; i++) {
-					ServiceRegistration service = ((ServiceRegistration) services[i]);
-					services[i] = service.getName();
-				}
-				return services;
-			}
-		}
-
-		return null;
-	}
-
-	private void refreshTopLevelElements(Object object) {
-		Object topLevelElement = getTopLevelElement(object);
-
-		if (topLevelElement == null)
-			return;
-
-		if (topLevelElement.getClass().isArray()) {
-			Object[] array = (Object[]) topLevelElement;
-			fRegistryBrowser.refresh(array);
-		} else {
-			fRegistryBrowser.refresh(topLevelElement);
-		}
-	}
-
-	protected void update(ModelChangeDelta[] deltas) {
-		for (int i = 0; i < deltas.length; i++) {
-			ModelObject object = deltas[i].getModelObject();
-			int flag = deltas[i].getFlag();
-
-			switch (flag) {
-				case ModelChangeDelta.ADDED :
-					if (topLevelElement(object)) {
-						fRegistryBrowser.add(object);
-					} else {
-						refreshTopLevelElements(object);
-					}
-					break;
-				case ModelChangeDelta.REMOVED :
-					if (topLevelElement(object)) {
-						fRegistryBrowser.remove(object);
-					} else {
-						refreshTopLevelElements(object);
-					}
-					break;
-				case ModelChangeDelta.STARTED :
-				case ModelChangeDelta.STOPPED :
-				case ModelChangeDelta.RESOLVED :
-				case ModelChangeDelta.UNRESOLVED :
-				case ModelChangeDelta.UPDATED :
-					if (topLevelElement(object)) {
-						fRegistryBrowser.refresh(object);
-					} else {
-						refreshTopLevelElements(object);
-					}
-					break;
-			}
-		}
-	}
-}

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

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.swt.layout.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
-
-public class RegistryFilteredTree extends FilteredTree {
-
-	private RegistryBrowser browser;
-
-	public RegistryFilteredTree(RegistryBrowser browser, Composite parent, int treeStyle, PatternFilter filter) {
-		super(parent, treeStyle, filter, true);
-		this.browser = browser;
-	}
-
-	protected void createControl(Composite parent, int treeStyle) {
-		super.createControl(parent, treeStyle);
-
-		// add 2px margin around filter text
-
-		FormLayout layout = new FormLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		setLayout(layout);
-
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.bottom = new FormAttachment(100, 0);
-		if (showFilterControls) {
-			FormData filterData= new FormData();
-			filterData.top = new FormAttachment(0, 2);
-			filterData.left = new FormAttachment(0, 2);
-			filterData.right = new FormAttachment(100, -2);
-			filterComposite.setLayoutData(filterData);
-			data.top = new FormAttachment(filterComposite, 2);
-		} else {
-			data.top = new FormAttachment(0, 0);
-		}
-		treeComposite.setLayoutData(data);
-	}
-
-	protected void updateToolbar(boolean visible) {
-		super.updateToolbar(visible);
-
-		// update view title on viewer's toolbar update
-		browser.updateTitle();
-	}
-}

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

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-public class Attribute extends ModelObject {
-	public static final String F_LOCATION = "Location"; //$NON-NLS-1$
-
-	public static final String F_BUNDLE = "Bundle"; //$NON-NLS-1$
-
-	private String name;
-	private String value;
-
-	public Attribute() {
-		// empty
-	}
-
-	public Attribute(String name, String value) {
-		this.name = name;
-		this.value = value;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-}

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

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-/**
- * Notifies on any changes coming from backend. Usually RegistryModel is only interested in receiving
- * news about that.
- *
- */
-public interface BackendChangeListener {
-
-	void addBundle(Bundle adapter);
-
-	void removeBundle(Bundle adapter);
-
-	void updateBundle(Bundle adapter, int updated);
-
-	void addService(ServiceRegistration adapter);
-
-	void removeService(ServiceRegistration adapter);
-
-	void updateService(ServiceRegistration adapter);
-
-	void addExtensions(Extension[] extensions);
-
-	void removeExtensions(Extension[] extensions);
-
-	void addExtensionPoints(ExtensionPoint[] extensionPoints);
-
-	void removeExtensionPoints(ExtensionPoint[] extensionPoints);
-}

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

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-import java.util.*;
-import org.eclipse.core.runtime.MultiStatus;
-import org.osgi.framework.BundleException;
-
-public class Bundle extends ModelObject {
-
-	public static final int ACTIVE = org.osgi.framework.Bundle.ACTIVE;
-	public static final int UNINSTALLED = org.osgi.framework.Bundle.UNINSTALLED;
-	public static final int INSTALLED = org.osgi.framework.Bundle.INSTALLED;
-
-	private String symbolicName;
-	private String location;
-	private boolean isEnabled;
-	private BundlePrerequisite[] imports = new BundlePrerequisite[0];
-	private String version;
-	private int state;
-	private long id;
-	private BundleLibrary[] libraries = new BundleLibrary[0];
-	private BundlePrerequisite[] importedPackages = new BundlePrerequisite[0];
-	private BundlePrerequisite[] exportedPackages = new BundlePrerequisite[0];
-
-	private String fragmentHost;
-	private String fragmentHostVersion;
-
-	public void setFragmentHost(String fragmentHost) {
-		this.fragmentHost = fragmentHost;
-	}
-
-	public String getFragmentHost() {
-		return fragmentHost;
-	}
-
-	public String getFragmentHostVersion() {
-		return fragmentHostVersion;
-	}
-
-	public void setFragmentHostVersion(String fragmentHostVersion) {
-		this.fragmentHostVersion = fragmentHostVersion;
-	}
-
-	public void setSymbolicName(String symbolicName) {
-		this.symbolicName = symbolicName;
-	}
-
-	public void setLocation(String location) {
-		this.location = location;
-	}
-
-	public void setImports(BundlePrerequisite[] imports) {
-		if (imports == null)
-			throw new IllegalArgumentException();
-
-		this.imports = imports;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public void setState(int state) {
-		this.state = state;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public void setEnabled(boolean enabled) {
-		isEnabled = enabled;
-	}
-
-	public void setLibraries(BundleLibrary[] libraries) {
-		if (libraries == null)
-			throw new IllegalArgumentException();
-
-		this.libraries = libraries;
-	}
-
-	public String getSymbolicName() {
-		return symbolicName;
-	}
-
-	public boolean isEnabled() {
-		return isEnabled;
-	}
-
-	public BundlePrerequisite[] getImports() {
-		return imports;
-	}
-
-	public BundleLibrary[] getLibraries() {
-		return libraries;
-	}
-
-	public String getLocation() {
-		return location;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public int getState() {
-		return state;
-	}
-
-	public long getId() {
-		return id;
-	}
-
-	public void start() throws BundleException {
-		if (model == null)
-			return;
-		model.backend.start(id);
-	}
-
-	public void stop() throws BundleException {
-		if (model == null)
-			return;
-		model.backend.stop(id);
-	}
-
-	public void enable() {
-		if (model == null)
-			return;
-		model.backend.setEnabled(id, true);
-	}
-
-	public void disable() {
-		if (model == null)
-			return;
-		model.backend.setEnabled(id, false);
-	}
-
-	public MultiStatus diagnose() {
-		if (model == null)
-			return null;
-		return model.backend.diagnose(id);
-	}
-
-	public ExtensionPoint[] getExtensionPoints() {
-		if (model == null)
-			return new ExtensionPoint[0];
-		ExtensionPoint[] extPoints = model.getExtensionPoints();
-		List result = new ArrayList();
-
-		for (int i = 0; i < extPoints.length; i++) {
-			if (extPoints[i].getContributorId().longValue() == id)
-				result.add(extPoints[i]);
-		}
-		return (ExtensionPoint[]) result.toArray(new ExtensionPoint[result.size()]);
-	}
-
-	public Extension[] getExtensions() {
-		if (model == null)
-			return new Extension[0];
-		ExtensionPoint[] extPoints = model.getExtensionPoints();
-		List result = new ArrayList();
-
-		for (int i = 0; i < extPoints.length; i++) {
-			for (Iterator it = extPoints[i].getExtensions().iterator(); it.hasNext();) {
-				Extension a = (Extension) it.next();
-				if (a.getContributorId().longValue() == id)
-					result.add(a);
-			}
-
-		}
-		return (Extension[]) result.toArray(new Extension[result.size()]);
-	}
-
-	public ServiceRegistration[] getRegisteredServices() {
-		if (model == null)
-			return new ServiceRegistration[0];
-		ServiceRegistration[] services = model.getServices();
-		List result = new ArrayList();
-
-		for (int i = 0; i < services.length; i++) {
-			if (symbolicName.equals(services[i].getBundle()))
-				result.add(services[i]);
-		}
-		return (ServiceRegistration[]) result.toArray(new ServiceRegistration[result.size()]);
-	}
-
-	public ServiceRegistration[] getServicesInUse() {
-		if (model == null)
-			return new ServiceRegistration[0];
-		ServiceRegistration[] services = model.getServices();
-		List result = new ArrayList();
-
-		for (int i = 0; i < services.length; i++) {
-			long[] usingBundles = services[i].getUsingBundleIds();
-			if (usingBundles != null) {
-				for (int j = 0; j < usingBundles.length; j++)
-					if (id == usingBundles[j])
-						result.add(services[i]);
-			}
-		}
-		return (ServiceRegistration[]) result.toArray(new ServiceRegistration[result.size()]);
-	}
-
-	public boolean equals(Object obj) {
-		return (obj instanceof Bundle) && (id == ((Bundle) obj).id);
-	}
-
-	public int hashCode() {
-		return (int) id;
-	}
-
-	public Bundle[] getFragments() {
-		if (model == null)
-			return new Bundle[0];
-		return model.getFragments(this);
-	}
-
-	public void setImportedPackages(BundlePrerequisite[] importedPackages) {
-		this.importedPackages = importedPackages;
-	}
-
-	public BundlePrerequisite[] getImportedPackages() {
-		return importedPackages;
-	}
-
-	public void setExportedPackages(BundlePrerequisite[] exportedPackages) {
-		this.exportedPackages = exportedPackages;
-	}
-
-	public BundlePrerequisite[] getExportedPackages() {
-		return exportedPackages;
-	}
-}

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

@@ -1,24 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, 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.model;
-
-public class BundleLibrary extends ModelObject {
-
-	private String library;
-
-	public String getLibrary() {
-		return library;
-	}
-
-	public void setLibrary(String name) {
-		library = name;
-	}
-}

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

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-public class BundlePrerequisite extends ModelObject {
-
-	private boolean isExported;
-	private String name;
-	private String version;
-	private boolean isPackage;
-
-	public void setPackage(boolean isPackage) {
-		this.isPackage = isPackage;
-	}
-
-	public boolean isPackage() {
-		return isPackage;
-	}
-
-	public void setExported(boolean isExported) {
-		this.isExported = isExported;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public boolean isExported() {
-		return isExported;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-}

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

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-public class ConfigurationElement extends Attribute {
-
-	private Attribute[] elements = new Attribute[0];
-
-	public void setElements(Attribute[] elements) {
-		if (elements == null)
-			throw new IllegalArgumentException();
-
-		this.elements = elements;
-	}
-
-	public Attribute[] getElements() {
-		return elements;
-	}
-}

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

@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-public class Extension extends ModelObject {
-
-	private String namespaceIdentifier;
-	private String label;
-	private String extensionPointUniqueIdentifier;
-	private ConfigurationElement[] configurationElements = new ConfigurationElement[0];
-	private Long contributor;
-
-	public void setNamespaceIdentifier(String namespaceIdentifier) {
-		this.namespaceIdentifier = namespaceIdentifier;
-	}
-
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	public void setExtensionPointUniqueIdentifier(String extensionPointUniqueIdentifier) {
-		this.extensionPointUniqueIdentifier = extensionPointUniqueIdentifier;
-	}
-
-	public void setConfigurationElements(ConfigurationElement[] configurationElements) {
-		if (configurationElements == null)
-			throw new IllegalArgumentException();
-
-		this.configurationElements = configurationElements;
-	}
-
-	public void setContributor(Long contributor) {
-		this.contributor = contributor;
-	}
-
-	public ConfigurationElement[] getConfigurationElements() {
-		return configurationElements;
-	}
-
-	public String getExtensionPointUniqueIdentifier() {
-		return extensionPointUniqueIdentifier;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public String getNamespaceIdentifier() {
-		return namespaceIdentifier;
-	}
-
-	/**
-	 * @return contributor id or <code>null</code> if contributor not present
-	 */
-	public Long getContributorId() {
-		return contributor;
-	}
-
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		Extension other = (Extension) obj;
-		if (contributor == null) {
-			if (other.contributor != null)
-				return false;
-		} else if (!contributor.equals(other.contributor))
-			return false;
-		if (extensionPointUniqueIdentifier == null) {
-			if (other.extensionPointUniqueIdentifier != null)
-				return false;
-		} else if (!extensionPointUniqueIdentifier.equals(other.extensionPointUniqueIdentifier))
-			return false;
-		if (label == null) {
-			if (other.label != null)
-				return false;
-		} else if (!label.equals(other.label))
-			return false;
-		if (namespaceIdentifier == null) {
-			if (other.namespaceIdentifier != null)
-				return false;
-		} else if (!namespaceIdentifier.equals(other.namespaceIdentifier))
-			return false;
-		return true;
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((contributor == null) ? 0 : contributor.hashCode());
-		result = prime * result + ((extensionPointUniqueIdentifier == null) ? 0 : extensionPointUniqueIdentifier.hashCode());
-		result = prime * result + ((label == null) ? 0 : label.hashCode());
-		result = prime * result + ((namespaceIdentifier == null) ? 0 : namespaceIdentifier.hashCode());
-		return result;
-	}
-
-	public ExtensionPoint getExtensionPoint() {
-		if (model == null)
-			return null;
-		return model.getExtensionPoint(extensionPointUniqueIdentifier);
-	}
-
-	/**
-	 * @return contributor or <code>null</code> if contributor not present
-	 */
-	public Bundle getContributor() {
-		if (model == null || contributor == null)
-			return null;
-		return model.getBundle(contributor);
-	}
-}

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

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ExtensionPoint extends ModelObject {
-
-	private String label;
-	private String uniqueIdentifier;
-	private String namespaceIdentifier;
-	private Long contributor;
-	private List extensions = new ArrayList();
-
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	public void setUniqueIdentifier(String uniqueIdentifier) {
-		this.uniqueIdentifier = uniqueIdentifier;
-	}
-
-	public void setNamespaceIdentifier(String namespaceIdentifier) {
-		this.namespaceIdentifier = namespaceIdentifier;
-	}
-
-	public void setContributor(Long contributor) {
-		this.contributor = contributor;
-	}
-
-	public void setExtensions(List extensions) {
-		this.extensions = extensions;
-	}
-
-	public List getExtensions() {
-		return extensions;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public String getUniqueIdentifier() {
-		return uniqueIdentifier;
-	}
-
-	public String getNamespaceIdentifier() {
-		return namespaceIdentifier;
-	}
-
-	/**
-	 * @return contributor id or <code>null</code> if contributor not present
-	 */
-	public Long getContributorId() {
-		return contributor;
-	}
-
-	/**
-	 * @return contributor or <code>null</code> if contributor not present
-	 */
-	public Bundle getContributor() {
-		if (model == null || contributor == null)
-			return null;
-		return model.getBundle(contributor);
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((uniqueIdentifier == null) ? 0 : uniqueIdentifier.hashCode());
-		return result;
-	}
-
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ExtensionPoint other = (ExtensionPoint) obj;
-		if (uniqueIdentifier == null) {
-			if (other.uniqueIdentifier != null)
-				return false;
-		} else if (!uniqueIdentifier.equals(other.uniqueIdentifier))
-			return false;
-		return true;
-	}
-}

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

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-public class Folder {
-
-	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_REGISTERED_SERVICES = 5;
-	public static final int F_SERVICES_IN_USE = 6;
-	public static final int F_PROPERTIES = 7;
-	public static final int F_USING_BUNDLES = 8;
-	public static final int F_FRAGMENTS = 9;
-	public static final int F_IMPORTED_PACKAGES = 10;
-	public static final int F_EXPORTED_PACKAGES = 11;
-
-	private int id;
-	private Object parent;
-
-	public Folder(int id, Object parent) {
-		this.id = id;
-		this.parent = parent;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public Object getParent() {
-		return parent;
-	}
-
-	public ModelObject[] getChildren() {
-		switch (id) {
-			case F_EXTENSION_POINTS :
-				return ((Bundle) parent).getExtensionPoints();
-			case F_EXTENSIONS :
-				return ((Bundle) parent).getExtensions();
-			case F_IMPORTS :
-				return ((Bundle) parent).getImports();
-			case F_LIBRARIES :
-				return ((Bundle) parent).getLibraries();
-			case F_REGISTERED_SERVICES :
-				return ((Bundle) parent).getRegisteredServices();
-			case F_SERVICES_IN_USE :
-				return ((Bundle) parent).getServicesInUse();
-			case F_PROPERTIES :
-				return ((ServiceRegistration) parent).getProperties();
-			case F_USING_BUNDLES :
-				return ((ServiceRegistration) parent).getUsingBundles();
-			case F_FRAGMENTS :
-				return ((Bundle) parent).getFragments();
-			case F_IMPORTED_PACKAGES :
-				return ((Bundle) parent).getImportedPackages();
-			case F_EXPORTED_PACKAGES :
-				return ((Bundle) parent).getExportedPackages();
-		}
-
-		return null;
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + id;
-		result = prime * result + ((parent == null) ? 0 : parent.hashCode());
-		return result;
-	}
-
-	public boolean equals(Object obj) {
-		return ((obj instanceof Folder) && (((Folder) obj).id == id) && (((Folder) obj).parent.equals(parent)));
-	}
-}

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

@@ -1,495 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Wolfgang Schell <ws@jetztgrad.net> - bug 259348
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.registry.model;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.service.resolver.*;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.internal.runtime.*;
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-public class LocalRegistryBackend implements IRegistryEventListener, BundleListener, ServiceListener, RegistryBackend {
-
-	private BackendChangeListener listener;
-
-	public void setRegistryListener(BackendChangeListener listener) {
-		this.listener = listener;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.runtime.registry.model.local.RegistryBackend#connect()
-	 */
-	public void connect(IProgressMonitor monitor) {
-		if (monitor.isCanceled())
-			return;
-
-		PDERuntimePlugin.getDefault().getBundleContext().addBundleListener(this);
-		Platform.getExtensionRegistry().addListener(this);
-		PDERuntimePlugin.getDefault().getBundleContext().addServiceListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.runtime.registry.model.local.RegistryBackend#disconnect()
-	 */
-	public void disconnect() {
-		Platform.getExtensionRegistry().removeListener(this);
-		PDERuntimePlugin.getDefault().getBundleContext().removeBundleListener(this);
-		PDERuntimePlugin.getDefault().getBundleContext().removeServiceListener(this);
-	}
-
-	protected static boolean isRegisteredService(org.osgi.framework.Bundle bundle, ServiceReference ref) {
-		return bundle.equals(ref.getBundle());
-	}
-
-	protected static boolean isServiceInUse(org.osgi.framework.Bundle bundle, ServiceReference ref) {
-		org.osgi.framework.Bundle[] usingBundles = ref.getUsingBundles();
-		return (usingBundles != null && Arrays.asList(usingBundles).contains(bundle));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.runtime.registry.model.local.RegistryBackend#start(org.osgi.framework.Bundle)
-	 */
-	public void start(long id) throws BundleException {
-		PDERuntimePlugin.getDefault().getBundleContext().getBundle(id).start();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.runtime.registry.model.local.RegistryBackend#stop(org.osgi.framework.Bundle)
-	 */
-	public void stop(long id) throws BundleException {
-		PDERuntimePlugin.getDefault().getBundleContext().getBundle(id).stop();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.runtime.registry.model.local.RegistryBackend#diagnose(org.osgi.framework.Bundle)
-	 */
-	public MultiStatus diagnose(long id) {
-		PlatformAdmin plaformAdmin = PDERuntimePlugin.getDefault().getPlatformAdmin();
-		State state = plaformAdmin.getState(false);
-
-		BundleDescription desc = state.getBundle(id);
-
-		PlatformAdmin platformAdmin = PDERuntimePlugin.getDefault().getPlatformAdmin();
-		VersionConstraint[] unsatisfied = platformAdmin.getStateHelper().getUnsatisfiedConstraints(desc);
-		ResolverError[] resolverErrors = platformAdmin.getState(false).getResolverErrors(desc);
-
-		MultiStatus problems = new MultiStatus(PDERuntimePlugin.ID, IStatus.INFO, PDERuntimeMessages.RegistryView_found_problems, null);
-		for (int i = 0; i < resolverErrors.length; i++) {
-			if ((resolverErrors[i].getType() & (ResolverError.MISSING_FRAGMENT_HOST | ResolverError.MISSING_GENERIC_CAPABILITY | ResolverError.MISSING_IMPORT_PACKAGE | ResolverError.MISSING_REQUIRE_BUNDLE)) != 0)
-				continue;
-			IStatus status = new Status(IStatus.WARNING, PDERuntimePlugin.ID, resolverErrors[i].toString());
-			problems.add(status);
-		}
-
-		for (int i = 0; i < unsatisfied.length; i++) {
-			IStatus status = new Status(IStatus.WARNING, PDERuntimePlugin.ID, MessageHelper.getResolutionFailureMessage(unsatisfied[i]));
-			problems.add(status);
-		}
-
-		return problems;
-	}
-
-	public void initializeBundles(IProgressMonitor monitor) {
-		if (monitor.isCanceled())
-			return;
-
-		org.osgi.framework.Bundle[] newBundles = PDERuntimePlugin.getDefault().getBundleContext().getBundles();
-		for (int i = 0; i < newBundles.length; i++) {
-			if (monitor.isCanceled())
-				return;
-
-			Bundle ba = createBundleAdapter(newBundles[i]);
-			listener.addBundle(ba);
-		}
-	}
-
-	public void initializeExtensionPoints(IProgressMonitor monitor) {
-		if (monitor.isCanceled())
-			return;
-
-		IExtensionPoint[] extPoints = Platform.getExtensionRegistry().getExtensionPoints();
-		ExtensionPoint[] extPts = new ExtensionPoint[extPoints.length];
-		for (int i = 0; i < extPoints.length; i++) {
-			if (monitor.isCanceled())
-				return;
-
-			extPts[i] = createExtensionPointAdapter(extPoints[i]);
-		}
-		listener.addExtensionPoints(extPts);
-	}
-
-	public void initializeServices(IProgressMonitor monitor) {
-		if (monitor.isCanceled())
-			return;
-
-		ServiceReference[] references = null;
-		try {
-			references = PDERuntimePlugin.getDefault().getBundleContext().getAllServiceReferences(null, null);
-		} catch (InvalidSyntaxException e) { // nothing
-		}
-
-		if (references == null) {
-			return;
-		}
-
-		for (int i = 0; i < references.length; i++) {
-			if (monitor.isCanceled())
-				return;
-
-			ServiceRegistration service = createServiceReferenceAdapter(references[i]);
-			listener.addService(service);
-		}
-	}
-
-	private Bundle createBundleAdapter(org.osgi.framework.Bundle bundle) {
-		Bundle adapter = new Bundle();
-		adapter.setSymbolicName(bundle.getSymbolicName());
-		adapter.setVersion((String) bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION));
-		adapter.setState(bundle.getState());
-		adapter.setId(bundle.getBundleId());
-		adapter.setEnabled(getIsEnabled(bundle));
-		adapter.setLocation(createLocation(bundle));
-
-		String fragmentHost = (String) bundle.getHeaders().get(Constants.FRAGMENT_HOST);
-		if (fragmentHost != null) {
-			ManifestElement[] header;
-			try {
-				header = ManifestElement.parseHeader(Constants.FRAGMENT_HOST, fragmentHost);
-
-				if (header.length > 0) {
-					ManifestElement host = header[0];
-					adapter.setFragmentHost(host.getValue());
-					String version = host.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE);
-					if (version != null) {
-						adapter.setFragmentHostVersion(version);
-					}
-				}
-			} catch (BundleException e) {
-				PDERuntimePlugin.log(e);
-			}
-		}
-
-		BundlePrerequisite[] imports = (BundlePrerequisite[]) getManifestHeaderArray(bundle, Constants.REQUIRE_BUNDLE);
-		if (imports != null)
-			adapter.setImports(imports);
-
-		BundleLibrary[] libraries = (BundleLibrary[]) getManifestHeaderArray(bundle, Constants.BUNDLE_CLASSPATH);
-		if (libraries != null)
-			adapter.setLibraries(libraries);
-
-		BundlePrerequisite[] importPackages = (BundlePrerequisite[]) getManifestHeaderArray(bundle, Constants.IMPORT_PACKAGE);
-		if (importPackages != null)
-			adapter.setImportedPackages(importPackages);
-
-		BundlePrerequisite[] exportPackages = (BundlePrerequisite[]) getManifestHeaderArray(bundle, Constants.EXPORT_PACKAGE);
-		if (exportPackages != null)
-			adapter.setExportedPackages(exportPackages);
-
-		return adapter;
-	}
-
-	private Extension createExtensionAdapter(IExtension extension) {
-		Extension adapter = new Extension();
-		adapter.setNamespaceIdentifier(extension.getNamespaceIdentifier());
-		adapter.setLabel(extension.getLabel());
-		adapter.setExtensionPointUniqueIdentifier(extension.getExtensionPointUniqueIdentifier());
-		adapter.setContributor(getBundleId(extension.getContributor().getName()));
-
-		IConfigurationElement[] elements = extension.getConfigurationElements();
-		if (elements.length > 0) {
-			ConfigurationElement[] configurationElements = new ConfigurationElement[elements.length];
-			for (int i = 0; i < elements.length; i++) {
-				configurationElements[i] = createConfigurationElement(elements[i]);
-			}
-			adapter.setConfigurationElements(configurationElements);
-		}
-
-		return adapter;
-	}
-
-	private ConfigurationElement createConfigurationElement(IConfigurationElement config) {
-		ConfigurationElement element = new ConfigurationElement();
-		element.setName(createName(config));
-		Attribute[] attributes = createConfigurationElementAttributes(config);
-		if (attributes != null)
-			element.setElements(attributes);
-		return element;
-	}
-
-	private static Long getBundleId(String name) {
-		BundleDescription descr = PDERuntimePlugin.getDefault().getPlatformAdmin().getState(false).getBundle(name, null);
-		return descr == null ? null : new Long(descr.getBundleId());
-	}
-
-	private ExtensionPoint createExtensionPointAdapter(IExtensionPoint extensionPoint) {
-		ExtensionPoint adapter = new ExtensionPoint();
-		adapter.setLabel(extensionPoint.getLabel());
-		adapter.setUniqueIdentifier(extensionPoint.getUniqueIdentifier());
-		adapter.setNamespaceIdentifier(extensionPoint.getNamespaceIdentifier());
-		adapter.setContributor(getBundleId(extensionPoint.getContributor().getName()));
-
-		Extension[] extensions = createExtensionAdapters(extensionPoint.getExtensions());
-		adapter.getExtensions().addAll(Arrays.asList(extensions));
-		return adapter;
-	}
-
-	private ServiceRegistration createServiceReferenceAdapter(ServiceReference ref) {
-		ServiceRegistration service = new ServiceRegistration();
-		service.setId(((Long) ref.getProperty(org.osgi.framework.Constants.SERVICE_ID)).longValue());
-		service.setBundle(ref.getBundle().getSymbolicName());
-
-		org.osgi.framework.Bundle[] usingBundles = ref.getUsingBundles();
-		long[] usingBundlesIds = null;
-		if (usingBundles != null) {
-			usingBundlesIds = new long[usingBundles.length];
-			for (int i = 0; i < usingBundles.length; i++) {
-				usingBundlesIds[i] = usingBundles[i].getBundleId();
-			}
-		}
-		if (usingBundlesIds != null)
-			service.setUsingBundles(usingBundlesIds);
-
-		String[] classes = (String[]) ref.getProperty(org.osgi.framework.Constants.OBJECTCLASS);
-		String[] propertyKeys = ref.getPropertyKeys();
-		Property[] properties = null;
-		if (propertyKeys != null) {
-			properties = new Property[propertyKeys.length];
-			for (int p = 0; p < propertyKeys.length; p++) {
-				String key = propertyKeys[p];
-				Object value = ref.getProperty(key);
-				properties[p] = new Property(key, ServiceRegistration.toString(value));
-			}
-		}
-
-		if (classes != null) {
-			Arrays.sort(classes);
-			service.setName(new ServiceName(classes));
-			service.setProperties(properties);
-		}
-		return service;
-	}
-
-	private static boolean getIsEnabled(org.osgi.framework.Bundle bundle) {
-		PlatformAdmin plaformAdmin = PDERuntimePlugin.getDefault().getPlatformAdmin();
-		State state = plaformAdmin.getState(false);
-
-		BundleDescription description = state.getBundle(bundle.getBundleId());
-		return (state.getDisabledInfos(description)).length == 0;
-	}
-
-	private static String createLocation(org.osgi.framework.Bundle bundle) {
-		URL bundleEntry = null;
-
-		try {
-			bundleEntry = bundle.getEntry("/"); //$NON-NLS-1$
-		} catch (IllegalStateException e) {
-			return null;
-		}
-
-		try {
-			bundleEntry = FileLocator.resolve(bundleEntry);
-		} catch (IOException e) { // do nothing
-		}
-		IPath path = new Path(bundleEntry.getFile());
-		String pathString = path.removeTrailingSeparator().toOSString();
-		if (pathString.startsWith("file:")) //$NON-NLS-1$
-			pathString = pathString.substring(5);
-		if (pathString.endsWith("!")) //$NON-NLS-1$
-			pathString = pathString.substring(0, pathString.length() - 1);
-		return pathString;
-	}
-
-	private Object[] getManifestHeaderArray(org.osgi.framework.Bundle bundle, String headerKey) {
-		String libraries = (String) bundle.getHeaders().get(headerKey);
-		try {
-			ManifestElement[] elements = ManifestElement.parseHeader(headerKey, libraries);
-			if (elements == null)
-				return null;
-			if (headerKey.equals(Constants.BUNDLE_CLASSPATH)) {
-				BundleLibrary[] array = new BundleLibrary[elements.length];
-				for (int i = 0; i < elements.length; i++) {
-					BundleLibrary library = new BundleLibrary();
-					library.setLibrary(elements[i].getValue());
-					array[i] = library;
-				}
-				return array;
-			} else if (headerKey.equals(Constants.REQUIRE_BUNDLE) || headerKey.equals(Constants.IMPORT_PACKAGE) || headerKey.equals(Constants.EXPORT_PACKAGE)) {
-				BundlePrerequisite[] array = new BundlePrerequisite[elements.length];
-				for (int i = 0; i < elements.length; i++) {
-					ManifestElement element = elements[i];
-
-					BundlePrerequisite prereq = new BundlePrerequisite();
-					prereq.setName(element.getValue());
-					if (headerKey.equals(Constants.REQUIRE_BUNDLE)) {
-						prereq.setVersion(element.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE));
-						String visibility = element.getDirective(Constants.VISIBILITY_DIRECTIVE);
-						prereq.setExported(Constants.VISIBILITY_REEXPORT.equals(visibility));
-					} else {
-						prereq.setVersion(element.getAttribute(Constants.VERSION_ATTRIBUTE));
-						prereq.setPackage(true);
-					}
-
-					array[i] = prereq;
-				}
-				return array;
-			}
-		} catch (BundleException e) { // do nothing
-		}
-		return null;
-	}
-
-	private Attribute[] createConfigurationElementAttributes(IConfigurationElement config) {
-		String[] atts = config.getAttributeNames();
-
-		Attribute[] catts = new Attribute[atts.length];
-		for (int i = 0; i < atts.length; i++)
-			catts[i] = new Attribute(atts[i], config.getAttribute(atts[i]));
-
-		IConfigurationElement[] children = config.getChildren();
-		Attribute[] result = new Attribute[children.length + catts.length];
-		for (int i = 0; i < children.length; i++) {
-			IConfigurationElement child = children[i];
-			result[i] = createConfigurationElement(child);
-		}
-		for (int i = 0; i < catts.length; i++) {
-			result[children.length + i] = catts[i];
-		}
-		return result;
-	}
-
-	private static String createName(IConfigurationElement config) {
-		String label = config.getAttribute("label"); //$NON-NLS-1$
-		if (label == null)
-			label = config.getName();
-
-		if (label == null)
-			label = config.getAttribute("name"); //$NON-NLS-1$
-
-		if (label == null && config.getAttribute("id") != null) { //$NON-NLS-1$
-			String[] labelSplit = config.getAttribute("id").split("\\."); //$NON-NLS-1$ //$NON-NLS-2$
-			label = labelSplit.length == 0 ? null : labelSplit[labelSplit.length - 1];
-		}
-
-		return label;
-	}
-
-	private Extension[] createExtensionAdapters(IExtension[] extensions) {
-		Extension[] extensionAdapters = new Extension[extensions.length];
-		for (int i = 0; i < extensions.length; i++) {
-			extensionAdapters[i] = createExtensionAdapter(extensions[i]);
-		}
-		return extensionAdapters;
-	}
-
-	public void bundleChanged(BundleEvent event) {
-		Bundle adapter = createBundleAdapter(event.getBundle());
-
-		switch (event.getType()) {
-			case BundleEvent.INSTALLED :
-				listener.addBundle(adapter);
-				break;
-			case BundleEvent.UNINSTALLED :
-				listener.removeBundle(adapter);
-				break;
-			case BundleEvent.UPDATED :
-				listener.updateBundle(adapter, ModelChangeDelta.UPDATED);
-				break;
-			case BundleEvent.RESOLVED :
-				listener.updateBundle(adapter, ModelChangeDelta.RESOLVED);
-				break;
-			case BundleEvent.UNRESOLVED :
-				listener.updateBundle(adapter, ModelChangeDelta.UNRESOLVED);
-				break;
-			case BundleEvent.STARTING :
-				listener.updateBundle(adapter, ModelChangeDelta.STARTING);
-				break;
-			case BundleEvent.STARTED :
-				listener.updateBundle(adapter, ModelChangeDelta.STARTED);
-				break;
-			case BundleEvent.STOPPING :
-				listener.updateBundle(adapter, ModelChangeDelta.STOPPING);
-				break;
-			case BundleEvent.STOPPED :
-				listener.updateBundle(adapter, ModelChangeDelta.STOPPED);
-				break;
-			default :
-				listener.updateBundle(adapter, ModelChangeDelta.UPDATED);
-		}
-	}
-
-	public void serviceChanged(ServiceEvent event) {
-		ServiceReference ref = event.getServiceReference();
-		ServiceRegistration adapter = createServiceReferenceAdapter(ref);
-
-		switch (event.getType()) {
-			case ServiceEvent.REGISTERED :
-				listener.addService(adapter);
-				break;
-			case ServiceEvent.UNREGISTERING :
-				listener.removeService(adapter);
-				break;
-			case ServiceEvent.MODIFIED :
-			default :
-				listener.updateService(adapter);
-				break;
-		}
-	}
-
-	private ExtensionPoint[] createExtensionPointAdapters(IExtensionPoint[] extensionPoints) {
-		ExtensionPoint[] result = new ExtensionPoint[extensionPoints.length];
-		for (int i = 0; i < extensionPoints.length; i++) {
-			result[i] = createExtensionPointAdapter(extensionPoints[i]);
-		}
-		return result;
-	}
-
-	public void added(IExtension[] extensions) {
-		listener.addExtensions(createExtensionAdapters(extensions));
-	}
-
-	public void removed(IExtension[] extensions) {
-		listener.removeExtensions(createExtensionAdapters(extensions));
-	}
-
-	public void added(IExtensionPoint[] extensionPoints) {
-		listener.addExtensionPoints(createExtensionPointAdapters(extensionPoints));
-	}
-
-	public void removed(IExtensionPoint[] extensionPoints) {
-		listener.removeExtensionPoints(createExtensionPointAdapters(extensionPoints));
-	}
-
-	public void setEnabled(long id, boolean enabled) {
-		State state = PDERuntimePlugin.getDefault().getState();
-		BundleDescription desc = state.getBundle(id);
-
-		if (enabled) {
-			DisabledInfo[] infos = state.getDisabledInfos(desc);
-			for (int i = 0; i < infos.length; i++) {
-				PlatformAdmin platformAdmin = PDERuntimePlugin.getDefault().getPlatformAdmin();
-				platformAdmin.removeDisabledInfo(infos[i]);
-			}
-		} else {
-			DisabledInfo info = new DisabledInfo("org.eclipse.pde.ui", "Disabled via PDE", desc); //$NON-NLS-1$ //$NON-NLS-2$
-			PlatformAdmin platformAdmin = PDERuntimePlugin.getDefault().getPlatformAdmin();
-			platformAdmin.addDisabledInfo(info);
-		}
-
-		org.osgi.framework.Bundle b = PDERuntimePlugin.getDefault().getBundleContext().getBundle(id);
-		PackageAdmin packageAdmin = PDERuntimePlugin.getDefault().getPackageAdmin();
-		packageAdmin.refreshPackages(new org.osgi.framework.Bundle[] {b});
-	}
-}

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

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-/**
- * Delta model objects are of type IBundle, IService, IExtension, IExtensionPoint
- */
-public class ModelChangeDelta {
-
-	public static final int ADDED = 0;
-	public static final int UPDATED = 1;
-	public static final int REMOVED = 2;
-	public static final int STARTING = 3;
-	public static final int STARTED = 4;
-	public static final int STOPPING = 5;
-	public static final int STOPPED = 6;
-	public static final int RESOLVED = 7;
-	public static final int UNRESOLVED = 8;
-
-	private ModelObject fObject;
-	private int fFlag;
-
-	public ModelChangeDelta(ModelObject object, int flag) {
-		fObject = object;
-		fFlag = flag;
-	}
-
-	public ModelObject getModelObject() {
-		return fObject;
-	}
-
-	public int getFlag() {
-		return fFlag;
-	}
-}

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

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-/**
- * Event provides a list of objects that have changed.
- * Possible objects on the list are IBundle, IService, IExtension, IExtensionPoint.
- * 
- * This is temporary solution and is subject to future changes.
- */
-public interface ModelChangeListener {
-
-	void modelChanged(ModelChangeDelta[] deltas);
-}

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

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-public abstract class ModelObject {
-
-	protected RegistryModel model;
-
-	public void setModel(RegistryModel model) {
-		this.model = model;
-	}
-}

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

@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Wolfgang Schell <ws@jetztgrad.net> - bug 260055
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.registry.model;
-
-import org.osgi.framework.Constants;
-
-public class Property extends ModelObject implements Comparable {
-	public static final String PREFIX_SERVICE = "service."; //$NON-NLS-1$
-	public static final String PREFIX_COMPONENT = "component."; //$NON-NLS-1$
-
-	private String name;
-	private String value;
-
-	public Property() {
-		// empty
-	}
-
-	// TODO should we merge this with Attribute somehow?
-	public Property(String name, String value) {
-		this.name = name;
-		this.value = value;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	/**
-	 * Compare properties for order. Returns a negative integer, zero, or a positive 
-	 * integer as the first argument is less than, equal to, or greater than the second.
-	 * 
-	 * <p>
-	 * The {@link Property}s are compared according to the following rules:
-	 * <ul>
-	 * <li>objectClass is always less than everything else</li>
-	 * <li>properties with names starting with "service." are considered "less" 
-	 * 		than other properties.</li>
-	 * <li>regular properties are considered "more" than other properties</li>
-	 * </ul>
-	 * </p>
-	 * 
-	 * <p>
-	 * When sorting an array of properties with the following code:
-	 * 
-	 * <pre>
-	 * Property[] properties = ...;
-	 * Arrays.sort(properties, PropertyComparator.INSTANCE);
-	 * </pre>
-	 * 
-	 * the result is something like this:
-	 * <ul>
-	 * <li>objectClass</li>
-	 * <li>service.id</li>
-	 * <li>service.id</li>
-	 * </ul>
-	 * </p>
-	 * 
-	 * @param obj other property to be compared against
-	 * 
-	 * @return a negative integer, zero, or a positive integer as the first 
-	 * 			argument is less than, equal to, or greater than the second. 
-	 */
-	public int compareTo(Object obj) {
-		if (!(obj instanceof Property)) {
-			return 0;
-		}
-
-		Property other = (Property) obj;
-
-		String name0 = getName();
-		String name1 = other.getName();
-
-		if (Constants.OBJECTCLASS.equals(name0)) {
-			return -1;
-		}
-
-		if (Constants.OBJECTCLASS.equals(name1)) {
-			return 1;
-		}
-
-		if (name0.startsWith(PREFIX_COMPONENT) && name1.startsWith(PREFIX_COMPONENT)) {
-			// both are service properties
-			// simply compare them
-			return name0.compareTo(name1);
-		}
-
-		if (name0.startsWith(PREFIX_COMPONENT)) {
-			return -1;
-		}
-
-		if (name1.startsWith(PREFIX_COMPONENT)) {
-			return 1;
-		}
-
-		if (name0.startsWith(PREFIX_SERVICE) && name1.startsWith(PREFIX_SERVICE)) {
-			// both are service properties
-			// simply compare them
-			return name0.compareTo(name1);
-		}
-
-		if (name0.startsWith(PREFIX_SERVICE)) {
-			return -1;
-		}
-
-		if (name1.startsWith(PREFIX_SERVICE)) {
-			return 1;
-		}
-
-		// simply compare strings
-		return name0.compareTo(name1);
-	}
-
-}

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

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.MultiStatus;
-import org.osgi.framework.BundleException;
-
-public interface RegistryBackend {
-
-	public void connect(IProgressMonitor monitor);
-
-	public void disconnect();
-
-	public void setEnabled(long id, boolean enabled);
-
-	public void start(long id) throws BundleException;
-
-	public void stop(long id) throws BundleException;
-
-	public MultiStatus diagnose(long id);
-
-	public void initializeBundles(IProgressMonitor monitor);
-
-	public void initializeExtensionPoints(IProgressMonitor monitor);
-
-	public void setRegistryListener(BackendChangeListener listener);
-
-	public void initializeServices(IProgressMonitor monitor);
-
-}
\ No newline at end of file

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

@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-import java.util.*;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osgi.service.resolver.VersionRange;
-import org.osgi.framework.Version;
-
-/**
- * Model entry point for Eclipse runtime. Provides information about runtime bundles, services and extension points.
- */
-public class RegistryModel {
-
-	private BackendChangeListener backendListener = new BackendChangeListener() {
-		public void addBundle(Bundle adapter) {
-			adapter.setModel(RegistryModel.this);
-			ModelChangeDelta delta = new ModelChangeDelta(adapter, ModelChangeDelta.ADDED);
-
-			bundles.put(new Long(adapter.getId()), adapter);
-
-			if (adapter.getFragmentHost() != null) {
-				addFragment(adapter);
-
-				Bundle host = getBundle(adapter.getFragmentHost(), adapter.getFragmentHostVersion());
-				if (host != null) {
-					ModelChangeDelta d2 = new ModelChangeDelta(host, ModelChangeDelta.UPDATED);
-					fireModelChangeEvent(new ModelChangeDelta[] {delta, d2});
-					return;
-				}
-			}
-
-			fireModelChangeEvent(new ModelChangeDelta[] {delta});
-		}
-
-		public void removeBundle(Bundle adapter) {
-			ModelChangeDelta delta = new ModelChangeDelta(adapter, ModelChangeDelta.REMOVED);
-
-			bundles.remove(new Long(adapter.getId()));
-
-			if (adapter.getFragmentHost() != null) {
-				removeFragment(adapter);
-
-				Bundle host = getBundle(adapter.getFragmentHost(), adapter.getFragmentHostVersion());
-				if (host != null) {
-					ModelChangeDelta d2 = new ModelChangeDelta(host, ModelChangeDelta.UPDATED);
-					fireModelChangeEvent(new ModelChangeDelta[] {delta, d2});
-					return;
-				}
-			}
-
-			fireModelChangeEvent(new ModelChangeDelta[] {delta});
-			adapter.setModel(null);
-		}
-
-		public void updateBundle(Bundle adapter, int updated) {
-			adapter.setModel(RegistryModel.this);
-			ModelChangeDelta delta = new ModelChangeDelta(adapter, updated);
-
-			bundles.put(new Long(adapter.getId()), adapter); // replace old with new one
-
-			if (adapter.getFragmentHost() != null) {
-				addFragment(adapter);
-			}
-
-			fireModelChangeEvent(new ModelChangeDelta[] {delta});
-		}
-
-		public void addService(ServiceRegistration adapter) {
-			ModelChangeDelta serviceNameDelta = null;
-			if (!serviceNames.contains(adapter.getName())) {
-				ServiceName name = adapter.getName();
-				name.setModel(RegistryModel.this);
-
-				serviceNames.add(name);
-
-				serviceNameDelta = new ModelChangeDelta(name, ModelChangeDelta.ADDED);
-			}
-
-			adapter.setModel(RegistryModel.this);
-			services.put(new Long(adapter.getId()), adapter);
-
-			ModelChangeDelta delta = new ModelChangeDelta(adapter, ModelChangeDelta.ADDED);
-
-			if (serviceNameDelta != null) {
-				fireModelChangeEvent(new ModelChangeDelta[] {serviceNameDelta, delta});
-			} else {
-				fireModelChangeEvent(new ModelChangeDelta[] {delta});
-			}
-		}
-
-		public void removeService(ServiceRegistration adapter) {
-			ModelChangeDelta serviceNameDelta = null;
-			if (getServices(adapter.getName().getClasses()).length == 0) {
-				serviceNames.remove(adapter.getName());
-				serviceNameDelta = new ModelChangeDelta(adapter.getName(), ModelChangeDelta.REMOVED);
-			}
-
-			services.remove(new Long(adapter.getId()));
-
-			ModelChangeDelta delta = new ModelChangeDelta(adapter, ModelChangeDelta.REMOVED);
-
-			if (serviceNameDelta != null) {
-				fireModelChangeEvent(new ModelChangeDelta[] {serviceNameDelta, delta});
-				adapter.getName().setModel(null);
-				adapter.setModel(null);
-			} else {
-				fireModelChangeEvent(new ModelChangeDelta[] {delta});
-				adapter.setModel(null);
-			}
-		}
-
-		public void updateService(ServiceRegistration adapter) {
-			adapter.setModel(RegistryModel.this);
-			services.put(new Long(adapter.getId()), adapter);
-
-			ModelChangeDelta delta = new ModelChangeDelta(adapter, ModelChangeDelta.UPDATED);
-
-			fireModelChangeEvent(new ModelChangeDelta[] {delta});
-		}
-
-		public void addExtensions(Extension[] extensionAdapters) {
-			for (int i = 0; i < extensionAdapters.length; i++) {
-				extensionAdapters[i].setModel(RegistryModel.this);
-				String id = extensionAdapters[i].getExtensionPointUniqueIdentifier();
-				ExtensionPoint extPoint = (ExtensionPoint) extensionPoints.get(id);
-				extPoint.getExtensions().add(extensionAdapters[i]);
-			}
-
-			ModelChangeDelta[] delta = new ModelChangeDelta[extensionAdapters.length];
-			for (int i = 0; i < delta.length; i++) {
-				delta[i] = new ModelChangeDelta(extensionAdapters[i], ModelChangeDelta.ADDED);
-			}
-			fireModelChangeEvent(delta);
-		}
-
-		public void removeExtensions(Extension[] extensionAdapters) {
-			for (int i = 0; i < extensionAdapters.length; i++) {
-				String id = extensionAdapters[i].getExtensionPointUniqueIdentifier();
-				ExtensionPoint extPoint = (ExtensionPoint) extensionPoints.get(id);
-				extPoint.getExtensions().remove(extensionAdapters[i]);
-			}
-
-			ModelChangeDelta[] delta = new ModelChangeDelta[extensionAdapters.length];
-			for (int i = 0; i < delta.length; i++) {
-				delta[i] = new ModelChangeDelta(extensionAdapters[i], ModelChangeDelta.REMOVED);
-			}
-			fireModelChangeEvent(delta);
-
-			for (int i = 0; i < extensionAdapters.length; i++) {
-				extensionAdapters[i].setModel(null);
-			}
-		}
-
-		public void addExtensionPoints(ExtensionPoint[] extensionPointAdapters) {
-			for (int i = 0; i < extensionPointAdapters.length; i++) {
-				extensionPointAdapters[i].setModel(RegistryModel.this);
-				extensionPoints.put(extensionPointAdapters[i].getUniqueIdentifier(), extensionPointAdapters[i]);
-			}
-
-			ModelChangeDelta[] delta = new ModelChangeDelta[extensionPointAdapters.length];
-			for (int i = 0; i < delta.length; i++) {
-				delta[i] = new ModelChangeDelta(extensionPointAdapters[i], ModelChangeDelta.ADDED);
-			}
-			fireModelChangeEvent(delta);
-		}
-
-		public void removeExtensionPoints(ExtensionPoint[] extensionPointAdapters) {
-			for (int i = 0; i < extensionPointAdapters.length; i++) {
-				extensionPoints.remove(extensionPointAdapters[i].getUniqueIdentifier());
-			}
-
-			ModelChangeDelta[] delta = new ModelChangeDelta[extensionPointAdapters.length];
-			for (int i = 0; i < delta.length; i++) {
-				delta[i] = new ModelChangeDelta(extensionPointAdapters[i], ModelChangeDelta.REMOVED);
-			}
-			fireModelChangeEvent(delta);
-
-			for (int i = 0; i < extensionPointAdapters.length; i++) {
-				extensionPointAdapters[i].setModel(null);
-			}
-		}
-	};
-
-	private List listeners = new ArrayList();
-	private Map bundles;
-	private Map services;
-	private Map extensionPoints;
-	private Set serviceNames;
-	private Map fragments;
-
-	protected RegistryBackend backend;
-
-	public RegistryModel(RegistryBackend backend) {
-		bundles = Collections.synchronizedMap(new HashMap());
-		services = Collections.synchronizedMap(new HashMap());
-		extensionPoints = Collections.synchronizedMap(new HashMap());
-		serviceNames = Collections.synchronizedSet(new HashSet());
-		fragments = Collections.synchronizedMap(new HashMap());
-
-		this.backend = backend;
-		backend.setRegistryListener(backendListener);
-	}
-
-	protected void addFragment(Bundle fragment) {
-		Set hostFragments = (Set) fragments.get(fragment.getFragmentHost());
-		if (hostFragments == null) {
-			hostFragments = Collections.synchronizedSet(new HashSet());
-			fragments.put(fragment.getFragmentHost(), hostFragments);
-		}
-
-		if (!hostFragments.add(fragment)) {
-			// not added if element already exists. So remove old and add it again.
-			hostFragments.remove(fragment);
-			hostFragments.add(fragment);
-		}
-	}
-
-	protected void removeFragment(Bundle fragment) {
-		Set hostFragments = (Set) fragments.get(fragment.getFragmentHost());
-		if (hostFragments == null) {
-			return;
-		}
-
-		hostFragments.remove(fragment);
-	}
-
-	public void connect(IProgressMonitor monitor, boolean forceInit) {
-		backend.connect(monitor);
-
-		if (forceInit) {
-			initialize(monitor);
-		}
-	}
-
-	public void initialize(IProgressMonitor monitor) {
-		backend.initializeBundles(monitor);
-		backend.initializeServices(monitor);
-		backend.initializeExtensionPoints(monitor);
-	}
-
-	public void disconnect() {
-		backend.disconnect();
-	}
-
-	public Bundle[] getBundles() {
-		return (Bundle[]) bundles.values().toArray(new Bundle[bundles.values().size()]);
-	}
-
-	public ExtensionPoint[] getExtensionPoints() {
-		return (ExtensionPoint[]) extensionPoints.values().toArray(new ExtensionPoint[extensionPoints.values().size()]);
-	}
-
-	public ServiceRegistration[] getServices() {
-		return (ServiceRegistration[]) services.values().toArray(new ServiceRegistration[services.values().size()]);
-	}
-
-	public ServiceName[] getServiceNames() {
-		return (ServiceName[]) serviceNames.toArray(new ServiceName[serviceNames.size()]);
-	}
-
-	public ServiceRegistration[] getServices(String[] classes) {
-		List result = new ArrayList();
-
-		for (Iterator i = services.values().iterator(); i.hasNext();) {
-			ServiceRegistration sr = (ServiceRegistration) i.next();
-			if (Arrays.equals(classes, sr.getName().getClasses()))
-				result.add(sr);
-		}
-
-		return (ServiceRegistration[]) result.toArray(new ServiceRegistration[result.size()]);
-	}
-
-	public void addModelChangeListener(ModelChangeListener listener) {
-		listeners.add(listener);
-	}
-
-	public void removeModelChangeListener(ModelChangeListener listener) {
-		listeners.remove(listener);
-	}
-
-	/**
-	 * For received domain types: Bundle, IExtension, IExtensionPoint, ServiceReference,
-	 * generates delta with model types: IBundle, IExtensionAdapter, IExtensionPointAdapter, IService
-	 *  
-	 * @param objects
-	 */
-	protected void fireModelChangeEvent(ModelChangeDelta[] delta) {
-		for (Iterator i = listeners.iterator(); i.hasNext();) {
-			ModelChangeListener listener = (ModelChangeListener) i.next();
-			listener.modelChanged(delta);
-		}
-	}
-
-	public Bundle getBundle(Long id) {
-		return (Bundle) bundles.get(id);
-	}
-
-	public Bundle getBundle(String symbolicName, String versionRange) {
-		for (Iterator i = bundles.values().iterator(); i.hasNext();) {
-			Bundle bundle = (Bundle) i.next();
-
-			if (bundle.getSymbolicName().equals(symbolicName)) {
-				if (versionMatches(bundle.getVersion(), versionRange))
-					return bundle;
-			}
-		}
-
-		return null;
-	}
-
-	public ExtensionPoint getExtensionPoint(String extensionPointUniqueIdentifier) {
-		return (ExtensionPoint) extensionPoints.get(extensionPointUniqueIdentifier);
-	}
-
-	public Bundle[] getFragments(Bundle bundle) {
-		Set set = (Set) fragments.get(bundle.getSymbolicName());
-		if (set == null)
-			return new Bundle[0];
-
-		List result = new ArrayList(set.size());
-		Version hostVersion = Version.parseVersion(bundle.getVersion());
-		for (Iterator i = set.iterator(); i.hasNext();) {
-			Bundle fragment = (Bundle) i.next();
-			String fragmentVersionOrRange = fragment.getFragmentHostVersion();
-
-			if (versionMatches(hostVersion, fragmentVersionOrRange))
-				result.add(fragment);
-		}
-
-		return (Bundle[]) result.toArray(new Bundle[result.size()]);
-	}
-
-	private boolean versionMatches(String hostVersion, String versionOrRange) {
-		try {
-			Version version = Version.parseVersion(hostVersion);
-			return versionMatches(version, versionOrRange);
-
-		} catch (IllegalArgumentException e) {
-			// ignore
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if hostVersion is greater or equal fragmentVersion, or is included in fragment version range
-	 * @param hostVersion Version
-	 * @param versionOrRange Version or VersionRange
-	 * @return true if matches, false otherwise
-	 */
-	private boolean versionMatches(Version hostVersion, String versionOrRange) {
-		if (versionOrRange == null) {
-			return true;
-		}
-
-		try {
-			Version version = Version.parseVersion(versionOrRange);
-			if (hostVersion.compareTo(version) >= 0)
-				return true;
-
-		} catch (IllegalArgumentException e) {
-			// wrong formatting, try VersionRange
-		}
-
-		try {
-			VersionRange range = new VersionRange(versionOrRange);
-			if (range.isIncluded(hostVersion))
-				return true;
-
-		} catch (IllegalArgumentException e2) {
-			// wrong range formatting
-		}
-
-		return false;
-	}
-
-	/*	void setEnabled(Bundle bundle, boolean enabled);
-
-		void start(Bundle bundle) throws BundleException; // XXX Create custom Exception
-
-		void stop(Bundle bundle) throws BundleException;
-
-		MultiStatus diagnose(Bundle bundle);*/
-
-}

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

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.model;
-
-
-/**
- * Produces RegistryModels for URLs. Valid URLs:
- * local
- * target
- * remote://host:port
- *
- */
-public class RegistryModelFactory {
-
-	/**
-	 * 
-	 * @param uri
-	 * @return never returns null
-	 */
-	public static RegistryModel getRegistryModel(String uri) {
-		return new RegistryModel(new LocalRegistryBackend());
-	}
-}

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

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

- * Copyright (c) 2009 IBM Corporation and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *     Wolfgang Schell <ws@jetztgrad.net> - bug 260055

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

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

-

-import java.util.Arrays;

-

-public class ServiceName extends ModelObject implements Comparable {

-

-	private String[] classes;

-

-	public ServiceName(String[] classes) {

-		this.classes = classes;

-	}

-

-	public String[] getClasses() {

-		return classes;

-	}

-

-	public ModelObject[] getChildren() {

-		return model.getServices(classes);

-	}

-

-	private static int hashCode(Object[] array) {

-		int prime = 31;

-		if (array == null)

-			return 0;

-		int result = 1;

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

-			result = prime * result + (array[index] == null ? 0 : array[index].hashCode());

-		}

-		return result;

-	}

-

-	public int hashCode() {

-		final int prime = 31;

-		return prime * ServiceName.hashCode(classes);

-	}

-

-	public boolean equals(Object obj) {

-		if (this == obj)

-			return true;

-		if (getClass() != obj.getClass())

-			return false;

-		ServiceName other = (ServiceName) obj;

-		return Arrays.equals(classes, other.classes);

-	}

-

-	public int compareTo(Object obj) {

-		if (obj instanceof ServiceName) {

-			// compare first class

-			ServiceName other = (ServiceName) obj;

-			String myClass = classes[0];

-			String otherClass = other.getClasses()[0];

-

-			return myClass.compareTo(otherClass);

-		}

-		return 0;

-

-	}

-}


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

@@ -1,146 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008, 2009 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *     Wolfgang Schell <ws@jetztgrad.net> - bug 259348, 260055
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.registry.model;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class ServiceRegistration extends ModelObject implements Comparable {
-
-	private long id;
-	private String bundle;
-	private long[] usingBundles = new long[0];
-	private ServiceName name;
-	private Property[] properties = new Property[0];
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public void setBundle(String bundle) {
-		this.bundle = bundle;
-	}
-
-	public void setUsingBundles(long[] usingBundles) {
-		if (usingBundles == null)
-			throw new IllegalArgumentException();
-
-		this.usingBundles = usingBundles;
-	}
-
-	public void setName(ServiceName name) {
-		if (name == null)
-			throw new IllegalArgumentException();
-
-		this.name = name;
-	}
-
-	public void setProperties(Property[] properties) {
-		if (properties == null)
-			throw new IllegalArgumentException();
-
-		this.properties = properties;
-	}
-
-	public long getId() {
-		return id;
-	}
-
-	public ServiceName getName() {
-		return name;
-	}
-
-	public String getBundle() {
-		return bundle;
-	}
-
-	public long[] getUsingBundleIds() {
-		return usingBundles;
-	}
-
-	public Bundle[] getUsingBundles() {
-		if (usingBundles.length == 0)
-			return new Bundle[0];
-
-		Set bundles = new HashSet();
-		for (int i = 0; i < usingBundles.length; i++) {
-			Bundle bundle = model.getBundle(new Long(usingBundles[i]));
-			if (bundle != null)
-				bundles.add(bundle);
-		}
-		return (Bundle[]) bundles.toArray(new Bundle[bundles.size()]);
-	}
-
-	public Property[] getProperties() {
-		return properties;
-	}
-
-	public Property getProperty(String name) {
-		for (int p = 0; p < properties.length; p++) {
-			Property property = properties[p];
-			if (name.equals(property.getName())) {
-				return property;
-			}
-		}
-		return null;
-	}
-
-	public static String toString(Object value) {
-		if (value == null) {
-			return ""; //$NON-NLS-1$
-		} else if (value instanceof CharSequence) {
-			CharSequence charSequence = (CharSequence) value;
-			return charSequence.toString();
-		} else if (value instanceof Object[]) {
-			StringBuffer buff = new StringBuffer();
-			appendString(buff, value);
-
-			return buff.toString();
-		} else {
-			return value.toString();
-		}
-	}
-
-	public static void appendString(StringBuffer buff, Object value) {
-		if (value == null) {
-			// ignore
-		} else if (value instanceof Object[]) {
-			Object[] objects = (Object[]) value;
-			buff.append("["); //$NON-NLS-1$
-			for (int o = 0; o < objects.length; o++) {
-				Object object = objects[o];
-				if (o > 0)
-					buff.append(", "); //$NON-NLS-1$
-				appendString(buff, object);
-			}
-			buff.append("]"); //$NON-NLS-1$
-		} else {
-			buff.append(value.toString());
-		}
-	}
-
-	public boolean equals(Object obj) {
-		return (obj instanceof ServiceRegistration) && (id == (((ServiceRegistration) obj).id));
-	}
-
-	public int hashCode() {
-		return (int) id;
-	}
-
-	public int compareTo(Object obj) {
-		if (obj instanceof ServiceRegistration) {
-			ServiceRegistration other = (ServiceRegistration) obj;
-			return name.compareTo(other.getName());
-		}
-		return 0;
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
deleted file mode 100644
index 38da77c..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
+++ /dev/null

@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *     Willian Mitsuda <wmitsuda@gmail.com> - bug 209841
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 209487
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.help.IContext;
-import org.eclipse.help.internal.context.Context;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.*;
-import org.osgi.framework.Bundle;
-
-/**
- * @since 3.4
- */
-public class SpyFormToolkit extends FormToolkit {
-
-	private static final String CLASS_PROTOCOL_PREFIX = "class://"; //$NON-NLS-1$
-
-	private static final String BUNDLE_PROTOCOL_PREFIX = "bundle://"; //$NON-NLS-1$
-
-	private class SpyHyperlinkAdapter extends HyperlinkAdapter {
-
-		private PopupDialog fDialog;
-
-		public SpyHyperlinkAdapter(PopupDialog dialog) {
-			this.fDialog = dialog;
-		}
-
-		public void linkActivated(HyperlinkEvent e) {
-			String href = (String) e.getHref();
-			if (href.startsWith(CLASS_PROTOCOL_PREFIX)) {
-				String clazz = href.substring(CLASS_PROTOCOL_PREFIX.length());
-				Bundle bundle = (Bundle) bundleClassByName.get(clazz);
-				SpyIDEUtil.openClass(bundle.getSymbolicName(), clazz);
-				fDialog.close();
-			} else if (href.startsWith(BUNDLE_PROTOCOL_PREFIX)) {
-				String bundle = href.substring(BUNDLE_PROTOCOL_PREFIX.length());
-				SpyIDEUtil.openBundleManifest(bundle);
-				fDialog.close();
-			}
-		}
-	}
-
-	private class SaveImageAction extends Action {
-
-		private Image image;
-
-		public SaveImageAction(Image image) {
-			this.image = image;
-		}
-
-		public void run() {
-			FileDialog fileChooser = new FileDialog(PDERuntimePlugin.getActiveWorkbenchShell(), SWT.SAVE);
-			fileChooser.setFileName("image"); //$NON-NLS-1$
-			fileChooser.setFilterExtensions(new String[] {"*.png"}); //$NON-NLS-1$
-			fileChooser.setFilterNames(new String[] {"PNG (*.png)"}); //$NON-NLS-1$
-			String filename = fileChooser.open();
-			if (filename == null)
-				return;
-
-			int filetype = determineFileType(filename);
-			if (filetype == SWT.IMAGE_UNDEFINED) {
-				return;
-			}
-			ImageLoader loader = new ImageLoader();
-			loader.data = new ImageData[] {image.getImageData()};
-			loader.save(filename, filetype);
-		}
-
-		private int determineFileType(String filename) {
-			String ext = filename.substring(filename.lastIndexOf('.') + 1);
-			if (ext.equalsIgnoreCase("gif")) //$NON-NLS-1$
-				return SWT.IMAGE_GIF;
-			if (ext.equalsIgnoreCase("ico")) //$NON-NLS-1$
-				return SWT.IMAGE_ICO;
-			if (ext.equalsIgnoreCase("jpg") || ext.equalsIgnoreCase("jpeg")) //$NON-NLS-1$//$NON-NLS-2$
-				return SWT.IMAGE_JPEG;
-			if (ext.equalsIgnoreCase("png")) //$NON-NLS-1$
-				return SWT.IMAGE_PNG;
-			return SWT.IMAGE_UNDEFINED;
-		}
-	}
-
-	private Map bundleClassByName = new HashMap();
-	private PopupDialog dialog;
-	private static String HELP_KEY = "org.eclipse.ui.help"; //$NON-NLS-1$
-
-	public SpyFormToolkit(PopupDialog dialog) {
-		super(Display.getDefault());
-		this.dialog = dialog;
-	}
-
-	public FormText createFormText(Composite parent, boolean trackFocus) {
-		FormText text = super.createFormText(parent, trackFocus);
-		if (PDERuntimePlugin.HAS_IDE_BUNDLES) {
-			text.addHyperlinkListener(new SpyHyperlinkAdapter(dialog));
-			addCopyQNameMenuItem(text);
-		}
-		return text;
-	}
-
-	private void addCopyQNameMenuItem(final FormText formText) {
-		Menu menu = formText.getMenu();
-		final MenuItem copyQNameItem = new MenuItem(menu, SWT.PUSH);
-		copyQNameItem.setImage(PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_COPY_QNAME));
-		copyQNameItem.setText(PDERuntimeMessages.SpyFormToolkit_copyQualifiedName);
-
-		SelectionListener listener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.widget == copyQNameItem) {
-					Clipboard clipboard = null;
-					try {
-						clipboard = new Clipboard(formText.getDisplay());
-						clipboard.setContents(new Object[] {((String) formText.getSelectedLinkHref()).substring(CLASS_PROTOCOL_PREFIX.length())}, new Transfer[] {TextTransfer.getInstance()});
-					} finally {
-						if (clipboard != null)
-							clipboard.dispose();
-					}
-				}
-			}
-		};
-		copyQNameItem.addSelectionListener(listener);
-		menu.addMenuListener(new MenuAdapter() {
-			public void menuShown(MenuEvent e) {
-				String href = (String) formText.getSelectedLinkHref();
-				copyQNameItem.setEnabled(href != null && href.startsWith(CLASS_PROTOCOL_PREFIX));
-			}
-		});
-	}
-
-	public String createInterfaceSection(FormText text, String title, Class[] clazzes) {
-		StringBuffer buffer = new StringBuffer();
-		if (clazzes.length > 0) {
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(title);
-			buffer.append("</p>"); //$NON-NLS-1$
-			for (int i = 0; i < clazzes.length; i++) {
-				buffer.append("<li bindent=\"20\" style=\"image\" value=\"interface\">"); //$NON-NLS-1$
-				createClassReference(buffer, clazzes[i]);
-				buffer.append("</li>"); //$NON-NLS-1$
-			}
-			Image image = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_INTERFACE_OBJ);
-			text.setImage("interface", image); //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-
-	public String createClassSection(FormText text, String title, Class[] clazzes) {
-		StringBuffer buffer = new StringBuffer();
-		if (clazzes.length > 0) {
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(title);
-			buffer.append("</p>"); //$NON-NLS-1$
-			for (int i = 0; i < clazzes.length; i++) {
-				buffer.append("<li bindent=\"20\" style=\"image\" value=\"class\">"); //$NON-NLS-1$
-				createClassReference(buffer, clazzes[i]);
-				buffer.append("</li>"); //$NON-NLS-1$
-			}
-			Image image = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_CLASS_OBJ);
-			text.setImage("class", image); //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-
-	public String createIdentifierSection(FormText text, String title, String[] ids) {
-		StringBuffer buffer = new StringBuffer();
-		if (ids.length > 0) {
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(title);
-			buffer.append("</p>"); //$NON-NLS-1$
-			for (int i = 0; i < ids.length; i++) {
-				buffer.append("<li bindent=\"20\" style=\"image\" value=\"id\">"); //$NON-NLS-1$
-				buffer.append(ids[i]);
-				buffer.append("</li>"); //$NON-NLS-1$
-			}
-			Image image = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_ID_OBJ);
-			text.setImage("id", image); //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-
-	public String createHelpIdentifierSection(Widget widget) {
-		return createHelpIdentifierSection(widget.getData(HELP_KEY));
-	}
-
-	public String createHelpIdentifierSection(IContext context) {
-		if (context instanceof Context)
-			return createHelpIdentifierSection(((Context) context).getId());
-		return new String();
-	}
-
-	private String createHelpIdentifierSection(Object help) {
-		StringBuffer buffer = new StringBuffer();
-		if (help != null) {
-			buffer.append("<li bindent=\"20\" style=\"image\" value=\"contextid\">"); //$NON-NLS-1$
-			buffer.append(help);
-			buffer.append("</li>"); //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-
-	private void createClassReference(StringBuffer buffer, Class clazz) {
-		Bundle bundle = PDERuntimePlugin.HAS_IDE_BUNDLES ? PDERuntimePlugin.getDefault().getPackageAdmin().getBundle(clazz) : null;
-		if (bundle != null) {
-			bundleClassByName.put(clazz.getName(), bundle);
-			buffer.append("<a href=\"").append(CLASS_PROTOCOL_PREFIX).append( //$NON-NLS-1$
-					clazz.getName()).append("\">") //$NON-NLS-1$
-					.append(getSimpleName(clazz)).append("</a>"); //$NON-NLS-1$
-		} else {
-			buffer.append(clazz.getName());
-		}
-	}
-
-	// TODO refactor me, I'm ugly
-	public void generatePluginDetailsText(Bundle bundle, String objectId, String objectType, StringBuffer buffer, FormText text) {
-		if (bundle != null) {
-			String version = (String) (bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION));
-
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(PDERuntimeMessages.SpyDialog_contributingPluginId_title);
-			buffer.append("</p>"); //$NON-NLS-1$
-			buffer.append("<li bindent=\"20\" style=\"image\" value=\"plugin\">"); //$NON-NLS-1$
-			if (PDERuntimePlugin.HAS_IDE_BUNDLES) {
-				buffer.append("<a href=\""); //$NON-NLS-1$
-				buffer.append(BUNDLE_PROTOCOL_PREFIX);
-				buffer.append(bundle.getSymbolicName());
-				buffer.append("\">"); //$NON-NLS-1$
-			}
-			buffer.append(bundle.getSymbolicName());
-			buffer.append(" ("); //$NON-NLS-1$
-			buffer.append(version);
-			buffer.append(")"); //$NON-NLS-1$
-			if (PDERuntimePlugin.HAS_IDE_BUNDLES) {
-				buffer.append("</a>"); //$NON-NLS-1$
-			}
-			buffer.append("</li>"); //$NON-NLS-1$
-
-			Image pluginImage = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_PLUGIN_OBJ);
-			text.setImage("plugin", pluginImage); //$NON-NLS-1$
-
-			if (objectId != null) {
-				buffer.append("<p>"); //$NON-NLS-1$
-				buffer.append(NLS.bind(PDERuntimeMessages.SpyDialog_contributingPluginId_desc, objectType));
-				buffer.append("</p>"); //$NON-NLS-1$
-				buffer.append("<li bindent=\"20\" style=\"image\" value=\"id\">"); //$NON-NLS-1$
-				buffer.append(objectId);
-				buffer.append("</li>"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	private String getSimpleName(Class clazz) {
-		String fullName = clazz.getName();
-		int index = fullName.lastIndexOf('.');
-		String name = fullName.substring(index + 1, fullName.length());
-		if (name != null)
-			return name;
-		return fullName;
-	}
-
-	private ToolBarManager createSectionToolbar(Section section) {
-		Object object = section.getData("toolbarmanager"); //$NON-NLS-1$
-		if (object instanceof ToolBarManager) {
-			return (ToolBarManager) object;
-		}
-		ToolBarManager manager = new ToolBarManager(SWT.FLAT);
-		ToolBar toolbar = manager.createControl(section);
-		final Cursor handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
-		toolbar.setCursor(handCursor);
-		// Cursor needs to be explicitly disposed
-		toolbar.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if ((handCursor != null) && (handCursor.isDisposed() == false)) {
-					handCursor.dispose();
-				}
-			}
-		});
-		section.setTextClient(toolbar);
-		section.setData("toolbarmanager", manager); //$NON-NLS-1$
-		return manager;
-	}
-
-	public void createImageAction(Section section, Image image) {
-		if (image == null)
-			return;
-		ToolBarManager manager = createSectionToolbar(section);
-		SaveImageAction action = new SaveImageAction(image);
-		action.setText(PDERuntimeMessages.SpyFormToolkit_saveImageAs_title);
-		action.setImageDescriptor(PDERuntimePluginImages.SAVE_IMAGE_AS_OBJ);
-		manager.add(action);
-		manager.update(true);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyIDEUtil.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyIDEUtil.java
deleted file mode 100644
index 7087a95..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyIDEUtil.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *     Marcelo Paternostro <marcelop@ca.ibm.com> - bug 201105
- *     Kevin Doyle <kjdoyle@ca.ibm.com> - bug 208137
- *     Willian Mitsuda <wmitsuda@gmail.com> - bug 209841
- *******************************************************************************/
-
-package org.eclipse.pde.internal.runtime.spy;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.PluginRegistry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.SearchablePluginsManager;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.PDERuntimePlugin;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
-
-/**
- * @since 3.4
- */
-public class SpyIDEUtil {
-	public static void openClass(String pluginId, String clazz) {
-		IPluginModelBase model = PluginRegistry.findModel(pluginId);
-		IResource resource = model != null ? model.getUnderlyingResource() : null;
-		IJavaProject project = null;
-
-		// if we don't find a model
-		if (model == null) {
-			MessageDialog.openError(Display.getCurrent().getActiveShell(), PDERuntimeMessages.SpyIDEUtil_noSourceFound_title, NLS.bind(PDERuntimeMessages.SpyIDEUtil_noSourceFound_message, new Object[] {clazz}));
-			return;
-		}
-
-		if (resource != null) { // project is open in workspace
-			project = JavaCore.create(resource.getProject());
-		} else {
-			SearchablePluginsManager manager = PDECore.getDefault().getSearchablePluginsManager();
-			try {
-				manager.createProxyProject(new NullProgressMonitor());
-				manager.addToJavaSearch(new IPluginModelBase[] {model});
-				project = manager.getProxyProject();
-			} catch (CoreException e) {
-			}
-		}
-		if (project != null)
-			openInEditor(project, clazz);
-	}
-
-	public static void openInEditor(IJavaProject project, String clazz) {
-		try {
-			IType type = project.findType(clazz);
-			JavaUI.openInEditor(type, false, true);
-		} catch (JavaModelException e) {
-			PDERuntimePlugin.log(e);
-		} catch (PartInitException e) {
-			PDERuntimePlugin.log(e);
-		}
-	}
-
-	public static void openBundleManifest(String bundleID) {
-		ManifestEditor.openPluginEditor(bundleID);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java
deleted file mode 100644
index 870252c..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/MenuSpyDialog.java
+++ /dev/null

@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.dialogs;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.pde.internal.runtime.spy.sections.ActiveMenuSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * @since 3.5
- */
-public class MenuSpyDialog extends PopupDialog {
-
-	private Event event;
-	private Point fAnchor;
-	private Composite composite;
-	private SpyFormToolkit toolkit;
-
-	private class CloseAction extends Action {
-		public ImageDescriptor getImageDescriptor() {
-			return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE);
-		}
-
-		public String getToolTipText() {
-			return PDERuntimeMessages.SpyDialog_close;
-		}
-
-		public void run() {
-			close();
-		}
-	}
-
-	public MenuSpyDialog(Shell parent, Event event, Point point) {
-		super(parent, SWT.NONE, true, true, false, false, false, null, null);
-		this.event = event;
-		this.fAnchor = point;
-		this.toolkit = new SpyFormToolkit(this);
-	}
-
-	/*
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IHelpContextIds.SPY_DIALOG);
-	}
-
-	protected Control createContents(Composite parent) {
-		getShell().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-		initializeBounds();
-		return createDialogArea(parent);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		this.composite = (Composite) super.createDialogArea(parent);
-
-		ScrolledForm form = toolkit.createScrolledForm(composite);
-		toolkit.decorateFormHeading(form.getForm());
-
-		// set title and image
-		form.setText(PDERuntimeMessages.MenuSpyDialog_title);
-		Image image = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_SPY_OBJ);
-		form.setImage(image);
-
-		// add a Close button to the toolbar
-		form.getToolBarManager().add(new CloseAction());
-		form.getToolBarManager().update(true);
-
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		layout.topMargin = 10;
-		layout.verticalSpacing = 10;
-		form.getBody().setLayout(layout);
-
-		// TODO, make this so we use an extension point.
-		ActiveMenuSection section = new ActiveMenuSection();
-		section.build(form, toolkit, event);
-
-		parent.pack();
-		return composite;
-	}
-
-	protected Point getInitialLocation(Point size) {
-		if (fAnchor == null) {
-			return super.getInitialLocation(size);
-		}
-		Point point = fAnchor;
-		Rectangle monitor = getShell().getMonitor().getClientArea();
-		if (monitor.width < point.x + size.x) {
-			point.x = Math.max(0, point.x - size.x);
-		}
-		if (monitor.height < point.y + size.y) {
-			point.y = Math.max(0, point.y - size.y);
-		}
-		return point;
-	}
-
-	public boolean close() {
-		if (toolkit != null)
-			toolkit.dispose();
-		toolkit = null;
-		return super.close();
-	}
-
-	protected Control getFocusControl() {
-		return this.composite;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java
deleted file mode 100644
index 574bc90..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 211580
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.dialogs;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.pde.internal.runtime.spy.sections.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * @since 3.4
- */
-public class SpyDialog extends PopupDialog {
-
-	private ExecutionEvent event;
-	private Point fAnchor;
-	private Composite composite;
-	private SpyFormToolkit toolkit;
-
-	private class CloseAction extends Action {
-		public ImageDescriptor getImageDescriptor() {
-			return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE);
-		}
-
-		public String getToolTipText() {
-			return PDERuntimeMessages.SpyDialog_close;
-		}
-
-		public void run() {
-			close();
-		}
-	}
-
-	public SpyDialog(Shell parent, ExecutionEvent event, Point point) {
-		super(parent, SWT.NONE, true, true, false, false, false, null, null);
-		this.event = event;
-		this.fAnchor = point;
-		this.toolkit = new SpyFormToolkit(this);
-	}
-
-	/*
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IHelpContextIds.SPY_DIALOG);
-	}
-
-	protected Control createContents(Composite parent) {
-		getShell().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-		initializeBounds();
-		return createDialogArea(parent);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		this.composite = (Composite) super.createDialogArea(parent);
-
-		ScrolledForm form = toolkit.createScrolledForm(composite);
-		toolkit.decorateFormHeading(form.getForm());
-
-		// set title and image
-		form.setText(PDERuntimeMessages.SpyDialog_title);
-		Image image = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_SPY_OBJ);
-		form.setImage(image);
-
-		// add a Close button to the toolbar
-		form.getToolBarManager().add(new CloseAction());
-		form.getToolBarManager().update(true);
-
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		layout.topMargin = 10;
-		layout.verticalSpacing = 10;
-		form.getBody().setLayout(layout);
-
-		// TODO, make this so we use an extension point.
-		ISpySection section = new ActiveShellSection();
-		section.build(form, toolkit, event);
-
-		section = new ActivePartSection();
-		section.build(form, toolkit, event);
-
-		section = new ActiveFormEditorSection();
-		section.build(form, toolkit, event);
-
-		section = new ActiveSelectionSection();
-		section.build(form, toolkit, event);
-
-		section = new ActiveWizardSection();
-		section.build(form, toolkit, event);
-
-		section = new ActiveDialogPageSection();
-		section.build(form, toolkit, event);
-
-		section = new ActiveHelpSection();
-		section.build(form, toolkit, event);
-
-		parent.pack();
-		return composite;
-	}
-
-	protected Point getInitialLocation(Point size) {
-		if (fAnchor == null) {
-			return super.getInitialLocation(size);
-		}
-		Point point = fAnchor;
-		Rectangle monitor = getShell().getMonitor().getClientArea();
-		if (monitor.width < point.x + size.x) {
-			point.x = Math.max(0, point.x - size.x);
-		}
-		if (monitor.height < point.y + size.y) {
-			point.y = Math.max(0, point.y - size.y);
-		}
-		return point;
-	}
-
-	public boolean close() {
-		if (toolkit != null)
-			toolkit.dispose();
-		toolkit = null;
-		return super.close();
-	}
-
-	protected Control getFocusControl() {
-		return this.composite;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/MenuSpyHandler.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/MenuSpyHandler.java
deleted file mode 100644
index ef5e4f9..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/MenuSpyHandler.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.pde.internal.runtime.PDERuntimePluginImages;
-import org.eclipse.pde.internal.runtime.spy.dialogs.MenuSpyDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * @since 3.5
- */
-public class MenuSpyHandler extends AbstractHandler implements Listener {
-
-	private PopupDialog INSTANCE = null;
-	private Cursor defaultCursor;
-	private Cursor spyCursor;
-
-	public MenuSpyHandler() {
-		// do nothing
-	}
-
-	public Object execute(ExecutionEvent event) {
-		if (event != null) {
-			if (INSTANCE != null && INSTANCE.getShell() != null && !INSTANCE.getShell().isDisposed()) {
-				INSTANCE.close();
-			}
-
-			Shell shell = HandlerUtil.getActiveShell(event);
-			if (shell != null) {
-				Display display = shell.getDisplay();
-				display.addFilter(SWT.Selection, this);
-				display.addFilter(SWT.KeyDown, this);
-				display.addFilter(SWT.Show, this);
-				if (display.getActiveShell() != null) {
-					defaultCursor = display.getActiveShell().getCursor();
-					Image image = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_MENUSPY_OBJ);
-					spyCursor = new Cursor(display, image.getImageData(), 7, 7);
-					display.getActiveShell().setCursor(spyCursor);
-				}
-			}
-		}
-		return null;
-	}
-
-	// TODO clean up this code
-	public void handleEvent(Event event) {
-		switch (event.type) {
-			case SWT.KeyDown :
-				if (event.keyCode == SWT.ESC)
-					break;
-			case SWT.Show :
-				if (spyCursor != null) {
-					Shell shell = event.display.getActiveShell();
-					if (shell != null) {
-						shell.setCursor(spyCursor);
-					}
-				}
-				return;
-		}
-		event.display.removeFilter(SWT.Selection, this);
-		event.display.removeFilter(SWT.KeyDown, this);
-		event.display.removeFilter(SWT.Show, this);
-		if (spyCursor != null) {
-			if (event.display.getActiveShell() != null) {
-				event.display.getActiveShell().setCursor(defaultCursor);
-				defaultCursor = null;
-				spyCursor.dispose();
-				spyCursor = null;
-			}
-		}
-
-		if (event.type == SWT.Selection) {
-			Shell shell = event.display.getActiveShell();
-			MenuSpyDialog dialog = new MenuSpyDialog(shell, event, shell.getDisplay().getCursorLocation());
-			INSTANCE = dialog;
-			dialog.create();
-			dialog.open();
-			event.doit = false;
-			event.type = SWT.None;
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/SpyHandler.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/SpyHandler.java
deleted file mode 100644
index 3babb1f..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/handlers/SpyHandler.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *     Kevin Doyle <kjdoyle@ca.ibm.com> - bug 200727
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.pde.internal.runtime.spy.dialogs.SpyDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * @since 3.4
- */
-public class SpyHandler extends AbstractHandler {
-
-	private SpyDialog INSTANCE = null;
-
-	public SpyHandler() { // do nothing
-	}
-
-	public Object execute(ExecutionEvent event) {
-		if (event != null) {
-			if (INSTANCE != null && INSTANCE.getShell() != null && !INSTANCE.getShell().isDisposed()) {
-				INSTANCE.close();
-			}
-			Shell shell = HandlerUtil.getActiveShell(event);
-			SpyDialog dialog = new SpyDialog(shell, event, shell.getDisplay().getCursorLocation());
-			INSTANCE = dialog;
-			dialog.create();
-			dialog.open();
-		}
-		return null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveDialogPageSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveDialogPageSection.java
deleted file mode 100644
index 3a88455..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveDialogPageSection.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *     Kevin Doyle <kjdoyle@ca.ibm.com> - bug 207868, 207904
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.dialogs.IDialogPage;
-import org.eclipse.jface.dialogs.IPageChangeProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.PDERuntimePlugin;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-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.handlers.HandlerUtil;
-import org.osgi.framework.Bundle;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * @since 3.4
- */
-public class ActiveDialogPageSection implements ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		final Shell shell = HandlerUtil.getActiveShell(event);
-		Object object = shell.getData();
-		if (object == null)
-			return;
-		Class clazz = object.getClass();
-
-		if (object instanceof IPageChangeProvider) {
-			IPageChangeProvider pageChangeProvider = (IPageChangeProvider) object;
-			Object selectedPage = pageChangeProvider.getSelectedPage();
-			if (selectedPage != null) {
-				Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-				section.clientVerticalSpacing = 9;
-				if (selectedPage instanceof IDialogPage) {
-					IDialogPage page = (IDialogPage) selectedPage;
-					clazz = page.getClass();
-					section.setText(NLS.bind(PDERuntimeMessages.SpyDialog_activeDialogPageSection_title, page.getTitle()));
-
-				} else {
-					clazz = selectedPage.getClass();
-					section.setText(PDERuntimeMessages.SpyDialog_activeDialogPageSection_title2);
-				}
-				// the active page
-				FormText text = toolkit.createFormText(section, true);
-				section.setClient(text);
-				TableWrapData td = new TableWrapData();
-				td.align = TableWrapData.FILL;
-				td.grabHorizontal = true;
-				section.setLayoutData(td);
-
-				StringBuffer buffer = new StringBuffer();
-				buffer.append("<form>"); //$NON-NLS-1$
-
-				buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.SpyDialog_activeDialogPageSection_desc, new Class[] {clazz}));
-
-				PackageAdmin admin = PDERuntimePlugin.getDefault().getPackageAdmin();
-				Bundle bundle = admin.getBundle(clazz);
-				toolkit.generatePluginDetailsText(bundle, null, "dialog page", buffer, text); //$NON-NLS-1$
-
-				buffer.append("</form>"); //$NON-NLS-1$
-				text.setText(buffer.toString(), true, false);
-			}
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveFormEditorSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveFormEditorSection.java
deleted file mode 100644
index 0d27ea9..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveFormEditorSection.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Ketan Padegaonkar <KetanPadegaonkar@gmail.com> - bug 241912
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-public class ActiveFormEditorSection implements ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		final IWorkbenchPart part = HandlerUtil.getActivePart(event);
-		if (!(part instanceof FormEditor))
-			return;
-		FormEditor multiEditor = (FormEditor) part;
-
-		Shell shell = HandlerUtil.getActiveShell(event);
-		Object object = shell.getData();
-		if (object == null)
-			return;
-
-		IFormPage activePage = multiEditor.getActivePageInstance();
-
-		Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-		section.setText(PDERuntimeMessages.ActiveFormEditorSection_Active_Form_Page);
-
-		FormText text = toolkit.createFormText(section, true);
-
-		section.setClient(text);
-		TableWrapData td = new TableWrapData();
-		td.align = TableWrapData.FILL;
-		td.grabHorizontal = true;
-		section.setLayoutData(td);
-
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<form>"); //$NON-NLS-1$
-		buffer.append(toolkit.createClassSection(text, NLS.bind(PDERuntimeMessages.SpyDialog_activePart_desc, "editor tab"), new Class[] {activePage.getClass()})); //$NON-NLS-1$
-		buffer.append("</form>"); //$NON-NLS-1$
-
-		text.setText(buffer.toString(), true, false);
-		text.layout();
-
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java
deleted file mode 100644
index c688d7a..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *     Remy Suen <remy.suen@gmail.com> - bug 203451
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IContextProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.PDERuntimePlugin;
-import org.eclipse.pde.internal.runtime.PDERuntimePluginImages;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-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.swt.widgets.Widget;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-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.handlers.HandlerUtil;
-import org.eclipse.ui.internal.WorkbenchPartReference;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * @since 3.4
- */
-public class ActiveHelpSection implements ISpySection {
-
-	private SpyFormToolkit toolkit;
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		this.toolkit = toolkit;
-		final Shell shell = HandlerUtil.getActiveShell(event);
-		Object object = shell.getData();
-		if (object == null)
-			return;
-
-		StringBuffer helpBuffer = new StringBuffer();
-		// process help
-		// TODO we need to make this cleaner... help processing is complicated atm
-		if (object instanceof PreferenceDialog) {
-			PreferenceDialog dialog = (PreferenceDialog) object;
-			IPreferencePage page = (IPreferencePage) dialog.getSelectedPage();
-			processHelp(page.getControl().getShell(), helpBuffer);
-			processChildren(page.getControl(), helpBuffer);
-		} else if (object instanceof Dialog) {
-			Dialog dialog = (Dialog) object;
-			processChildren(dialog.getShell(), helpBuffer);
-		} else {
-			helpBuffer.append(processControlHelp(event, toolkit));
-		}
-
-		if (helpBuffer != null && helpBuffer.length() > 0) {
-			Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-			section.setText(PDERuntimeMessages.SpyDialog_activeHelpSection_title);
-			section.clientVerticalSpacing = 9;
-
-			FormText text = toolkit.createFormText(section, true);
-			section.setClient(text);
-			TableWrapData td = new TableWrapData();
-			td.align = TableWrapData.FILL;
-			td.grabHorizontal = true;
-			section.setLayoutData(td);
-
-			Image image = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_CONTEXTID_OBJ);
-			text.setImage("contextid", image); //$NON-NLS-1$
-
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("<form>"); //$NON-NLS-1$
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(PDERuntimeMessages.SpyDialog_activeHelpSection_desc);
-			buffer.append("</p>"); //$NON-NLS-1$
-			buffer.append(helpBuffer.toString());
-			buffer.append("</form>"); //$NON-NLS-1$
-			String content = buffer.toString().replaceAll("&", "&amp;"); //$NON-NLS-1$ //$NON-NLS-2$
-			text.setText(content, true, false);
-		}
-
-	}
-
-	private void processHelp(Widget widget, StringBuffer buffer) {
-		buffer.append(toolkit.createHelpIdentifierSection(widget));
-	}
-
-	private void processChildren(Control control, StringBuffer buffer) {
-		processHelp(control, buffer);
-		if (control instanceof Composite) {
-			Composite composite = (Composite) control;
-			Control[] controls = composite.getChildren();
-			for (int i = 0; i < controls.length; i++) {
-				processChildren(controls[i], buffer);
-			}
-		}
-	}
-
-	private String processControlHelp(ExecutionEvent event, SpyFormToolkit toolkit) {
-		IWorkbenchPart part = HandlerUtil.getActivePart(event);
-		if (part == null)
-			return null;
-
-		IWorkbenchWindow window = part.getSite().getWorkbenchWindow();
-		if (window == null)
-			return null;
-
-		StringBuffer buffer = new StringBuffer();
-
-		Shell shell = null;
-		Control control = null;
-
-		if (part instanceof IEditorPart) {
-			IEditorPart editorPart = (IEditorPart) part;
-			shell = editorPart.getSite().getShell();
-
-			for (int j = 0; j < window.getActivePage().getEditorReferences().length; j++) {
-				IEditorReference er = window.getActivePage().getEditorReferences()[j];
-				if (er.getId().equals(editorPart.getEditorSite().getId()))
-					if (er instanceof WorkbenchPartReference) {
-						WorkbenchPartReference wpr = (WorkbenchPartReference) er;
-						control = wpr.getPane().getControl();
-						shell = null;
-						break;
-					}
-			}
-		} else if (part instanceof ViewPart) {
-			ViewPart viewPart = (ViewPart) part;
-			shell = viewPart.getSite().getShell();
-			for (int j = 0; j < window.getActivePage().getViewReferences().length; j++) {
-				IViewReference vr = window.getActivePage().getViewReferences()[j];
-				if (vr.getId().equals(viewPart.getViewSite().getId()))
-					if (vr instanceof WorkbenchPartReference) {
-						WorkbenchPartReference wpr = (WorkbenchPartReference) vr;
-						control = wpr.getPane().getControl();
-						shell = null;
-						break;
-					}
-			}
-
-		}
-		if (shell != null) {
-			buffer.append(toolkit.createHelpIdentifierSection(shell));
-			for (int i = 0; i < shell.getChildren().length; i++) {
-				processChildren(shell.getChildren()[i], buffer);
-			}
-		} else if (control != null) {
-			// if we don't have org.eclipse.help, we will have problems when trying to load IContextProvider
-			if (!PDERuntimePlugin.HAS_IDE_BUNDLES)
-				processChildren(control, buffer);
-			else {
-				IContextProvider provider = (IContextProvider) part.getAdapter(IContextProvider.class);
-				IContext context = (provider != null) ? provider.getContext(control) : null;
-				if (context != null) {
-					buffer.append(toolkit.createHelpIdentifierSection(context));
-				} else {
-					buffer.append(toolkit.createHelpIdentifierSection(control));
-				}
-				if (control instanceof Composite) {
-					Composite parent = (Composite) control;
-					for (int i = 0; i < parent.getChildren().length; i++) {
-						processChildren(parent.getChildren()[i], buffer);
-					}
-				}
-			}
-		}
-		return buffer.toString();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveMenuSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveMenuSection.java
deleted file mode 100644
index 7c8d159..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveMenuSection.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *     Anyware Technologies - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import org.eclipse.core.commands.Command;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.PDERuntimePlugin;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.actions.RetargetAction;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.internal.*;
-import org.eclipse.ui.menus.CommandContributionItem;
-import org.osgi.framework.Bundle;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * @since 3.5
- */
-public class ActiveMenuSection implements ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, Event event) {
-
-		Object object = event.widget.getData();
-		if (object != null) {
-			Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-			section.clientVerticalSpacing = 9;
-			section.setText(PDERuntimeMessages.SpyDialog_activeSelection_title);
-			FormText text = toolkit.createFormText(section, true);
-			section.setClient(text);
-
-			TableWrapData td = new TableWrapData();
-			td.align = TableWrapData.FILL;
-			td.grabHorizontal = true;
-			section.setLayoutData(td);
-
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("<form>"); //$NON-NLS-1$
-			if (object instanceof IContributionItem) {
-				IContributionItem item = (IContributionItem) object;
-				String id = item.getId();
-				if (id != null) {
-					buffer.append(toolkit.createIdentifierSection(text, PDERuntimeMessages.ActiveMenuSection_0, new String[] {id}));
-				}
-				if (object instanceof ContributionItem) {
-					createLocationURI(toolkit, object, text, buffer, id);
-				}
-				scan(item, buffer, toolkit, text);
-			}
-
-			buffer.append("</form>"); //$NON-NLS-1$
-			text.setText(buffer.toString(), true, false);
-		}
-	}
-
-	private void createLocationURI(SpyFormToolkit toolkit, Object object, FormText text, StringBuffer buffer, String id) {
-		IContributionManager parent = ((ContributionItem) object).getParent();
-		if (parent instanceof IMenuManager) {
-			String parentId = ((IMenuManager) parent).getId();
-			String locationURI = "menu:" + parentId + (id == null ? "?after=additions" : "?after=" + id); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			buffer.append(toolkit.createIdentifierSection(text, PDERuntimeMessages.ActiveMenuSection_7, new String[] {locationURI}));
-		} else if (parent instanceof ToolBarManager) {
-			ToolBar bar = ((ToolBarManager) parent).getControl();
-			if (bar.getParent() instanceof CoolBar) {
-				CoolItem[] items = ((CoolBar) bar.getParent()).getItems();
-				for (int i = 0; i < items.length; i++) {
-					CoolItem coolItem = items[i];
-					if (coolItem.getControl() == bar) {
-						Object o = coolItem.getData();
-						if (o instanceof ToolBarContributionItem) {
-							String parentId = ((ToolBarContributionItem) o).getId();
-							String locationURI = "toolbar:" + parentId + (id == null ? "?after=additions" : "?after=" + id); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-							buffer.append(toolkit.createIdentifierSection(text, PDERuntimeMessages.ActiveMenuSection_7, new String[] {locationURI}));
-						}
-						continue;
-					}
-				}
-			}
-		}
-	}
-
-	// FIXME this is a bit hackish but works... need to redo
-	private void scan(IContributionItem item, StringBuffer buffer, SpyFormToolkit toolkit, FormText text) {
-		// check for action set information
-		if (item instanceof IActionSetContributionItem) {
-			IActionSetContributionItem actionItem = (IActionSetContributionItem) item;
-			buffer.append(toolkit.createIdentifierSection(text, PDERuntimeMessages.ActiveMenuSection_1, new String[] {actionItem.getActionSetId()}));
-		}
-		if (item instanceof ActionContributionItem) {
-			createActionContributionItemText(item, buffer, toolkit, text);
-		} else if (item instanceof SubContributionItem) {
-			SubContributionItem subItem = (SubContributionItem) item;
-			scan(subItem.getInnerItem(), buffer, toolkit, text); // recurse
-		} else if (item instanceof CommandContributionItem) { // TODO... this is hard...
-			CommandContributionItem contributionItem = (CommandContributionItem) item;
-			Command command = contributionItem.getCommand().getCommand();
-			buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.ActiveMenuSection_2, new Class[] {command.getClass()}));
-			buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.ActiveMenuSection_3, new Class[] {command.getHandler().getClass()}));
-		}
-	}
-
-	private void createActionContributionItemText(Object object, StringBuffer buffer, SpyFormToolkit toolkit, FormText text) {
-		ActionContributionItem actionItem = (ActionContributionItem) object;
-		IAction action = actionItem.getAction();
-
-		String id = action.getActionDefinitionId();
-		if (id != null) {
-			buffer.append(toolkit.createIdentifierSection(text, PDERuntimeMessages.ActiveMenuSection_4, new String[] {action.getActionDefinitionId()}));
-		}
-
-		if (action instanceof PluginAction) {
-			PluginAction pluginAction = (PluginAction) action;
-			Class clazz = pluginAction.getClass();
-			createActionContributionItemText(object, buffer, toolkit, text, clazz, pluginAction);
-
-		} else {
-			// normal JFace Actions
-			Class clazz = action.getClass();
-			buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.ActiveMenuSection_5, new Class[] {clazz}));
-			PackageAdmin admin = PDERuntimePlugin.getDefault().getPackageAdmin();
-			Bundle bundle = admin.getBundle(clazz);
-			toolkit.generatePluginDetailsText(bundle, null, "meow", buffer, text); //$NON-NLS-1$
-		}
-
-	}
-
-	private void createActionContributionItemText(Object object, StringBuffer buffer, SpyFormToolkit toolkit, FormText text, Class clazz, PluginAction pluginAction) {
-		try {
-			RetargetAction retargetAction = null;
-			IActionDelegate delegate = null;
-			if (pluginAction instanceof WWinPluginAction) {
-				// such an action *may* have a retarget action
-				Field field = clazz.getDeclaredField("retargetAction"); //$NON-NLS-1$
-				field.setAccessible(true);
-				retargetAction = (RetargetAction) field.get(pluginAction);
-			}
-			// if there's no retarget action OR if the pluginAction is not a WWinPluginAction, let's try to find the action delegate
-			if (retargetAction == null) {
-				Field field = clazz.getDeclaredField("delegate"); //$NON-NLS-1$
-				field.setAccessible(true);
-				delegate = (IActionDelegate) field.get(pluginAction);
-				if (delegate == null) { // have to invoke createDelegate if we don't have one yet...
-					Method method = clazz.getDeclaredMethod("createDelegate", null); //$NON-NLS-1$
-					method.setAccessible(true);
-					method.invoke(pluginAction, null);
-					delegate = (IActionDelegate) field.get(pluginAction);
-				}
-			}
-			buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.ActiveMenuSection_6, new Class[] {(retargetAction == null) ? delegate.getClass() : retargetAction.getActionHandler().getClass()}));
-			PackageAdmin admin = PDERuntimePlugin.getDefault().getPackageAdmin();
-			Bundle bundle = admin.getBundle(clazz);
-			toolkit.generatePluginDetailsText(bundle, null, "menu item", buffer, text); //$NON-NLS-1$
-
-		} catch (Exception e) {
-			Class superclass = clazz.getSuperclass();
-			if (superclass != null) {
-				createActionContributionItemText(object, buffer, toolkit, text, superclass, pluginAction);
-			}
-		}
-	}
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		// do nothing
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActivePartSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActivePartSection.java
deleted file mode 100644
index eab9dda..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActivePartSection.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *     Heiko Seeberger - changes for bug 237764
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import java.lang.reflect.Field;
-import java.util.*;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.internal.PartSite;
-import org.eclipse.ui.internal.PopupMenuExtender;
-import org.eclipse.ui.part.IPage;
-import org.eclipse.ui.part.PageBookView;
-import org.osgi.framework.Bundle;
-
-/**
- * @since 3.4
- */
-public class ActivePartSection implements ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
-		if (window == null) // if we don't have an active workbench, we don't have a valid selection to analyze
-			return;
-
-		final IWorkbenchPart part = HandlerUtil.getActivePart(event);
-		if (part == null)
-			return; // (Bug 237764) if no active part let's do nothing ...
-
-		String partType = part instanceof IEditorPart ? "editor" : "view"; //$NON-NLS-1$ //$NON-NLS-2$
-		Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-
-		section.setText(NLS.bind(PDERuntimeMessages.SpyDialog_activePart_title, part.getSite().getRegisteredName()));
-
-		FormText text = toolkit.createFormText(section, true);
-		section.setClient(text);
-		TableWrapData td = new TableWrapData();
-		td.align = TableWrapData.FILL;
-		td.grabHorizontal = true;
-		section.setLayoutData(td);
-
-		//toolkit.createImageAction(section, part.getTitleImage());
-
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<form>"); //$NON-NLS-1$
-
-		// time to analyze the active part
-		buffer.append(toolkit.createClassSection(text, NLS.bind(PDERuntimeMessages.SpyDialog_activePart_desc, partType), new Class[] {part.getClass()}));
-		if (part instanceof PageBookView) {
-			PageBookView outline = (PageBookView) part;
-			IPage currentPage = outline.getCurrentPage();
-			if (currentPage != null) {
-				buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.SpyDialog_activePageBook_title, new Class[] {currentPage.getClass()}));
-			}
-		}
-
-		// time to analyze the contributing plug-in
-		final Bundle bundle = Platform.getBundle(part.getSite().getPluginId());
-
-		toolkit.generatePluginDetailsText(bundle, part.getSite().getId(), partType, buffer, text);
-
-		// get menu information using reflection
-		try {
-			PartSite site = (PartSite) part.getSite();
-			Class clazz = site.getClass().getSuperclass();
-			Field field = clazz.getDeclaredField("menuExtenders"); //$NON-NLS-1$
-			field.setAccessible(true);
-			List list = (List) field.get(site);
-			if (list != null && list.size() > 0) {
-				Set menuIds = new LinkedHashSet();
-				for (int i = 0; i < list.size(); i++) {
-					PopupMenuExtender extender = (PopupMenuExtender) list.get(i);
-					menuIds.addAll(extender.getMenuIds());
-				}
-				buffer.append("<p>"); //$NON-NLS-1$
-				buffer.append(PDERuntimeMessages.SpyDialog_activeMenuIds);
-				buffer.append("</p>"); //$NON-NLS-1$
-				for (Iterator it = menuIds.iterator(); it.hasNext();) {
-					buffer.append("<li bindent=\"20\" style=\"image\" value=\"menu\">"); //$NON-NLS-1$
-					buffer.append(it.next().toString());
-					buffer.append("</li>"); //$NON-NLS-1$
-				}
-				Image menuImage = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_MENU_OBJ);
-				text.setImage("menu", menuImage); //$NON-NLS-1$
-			}
-		} catch (SecurityException e) {
-			PDERuntimePlugin.log(e);
-		} catch (NoSuchFieldException e) {
-			PDERuntimePlugin.log(e);
-		} catch (IllegalArgumentException e) {
-			PDERuntimePlugin.log(e);
-		} catch (IllegalAccessException e) {
-			PDERuntimePlugin.log(e);
-		}
-
-		buffer.append("</form>"); //$NON-NLS-1$
-
-		Image idImage = PDERuntimePluginImages.get(PDERuntimePluginImages.IMG_ID_OBJ);
-		text.setImage("id", idImage); //$NON-NLS-1$
-
-		text.setText(buffer.toString(), true, false);
-		text.layout();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveSelectionSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveSelectionSection.java
deleted file mode 100644
index e8319aa..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveSelectionSection.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import org.eclipse.osgi.util.NLS;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-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.handlers.HandlerUtil;
-
-/**
- * @since 3.4
- */
-public class ActiveSelectionSection implements ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
-		if (window == null) // if we don't have an active workbench, we don't have a valid selection to analyze
-			return;
-
-		// analyze the selection
-		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		if (selection != null) {
-			Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-			section.clientVerticalSpacing = 9;
-			section.setText(PDERuntimeMessages.SpyDialog_activeSelection_title);
-			FormText text = toolkit.createFormText(section, true);
-			section.setClient(text);
-
-			TableWrapData td = new TableWrapData();
-			td.align = TableWrapData.FILL;
-			td.grabHorizontal = true;
-			section.setLayoutData(td);
-
-			// time to analyze the selection
-			Class clazz = selection.getClass();
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("<form>"); //$NON-NLS-1$
-			buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.SpyDialog_activeSelection_desc, new Class[] {clazz}));
-
-			Class[] interfaces = clazz.getInterfaces();
-			buffer.append(toolkit.createInterfaceSection(text, PDERuntimeMessages.SpyDialog_activeSelectionInterfaces_desc, interfaces));
-
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection ss = (IStructuredSelection) selection;
-				int size = ss.size();
-				if (size == 1) {
-					clazz = ss.getFirstElement().getClass();
-					buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.SpyDialog_activeSelectedElement_desc, new Class[] {clazz}));
-
-					interfaces = clazz.getInterfaces();
-					buffer.append(toolkit.createInterfaceSection(text, PDERuntimeMessages.SpyDialog_activeSelectedElementInterfaces_desc, interfaces));
-				} else if (size > 1) {
-					buffer.append(NLS.bind(PDERuntimeMessages.SpyDialog_activeSelectedElementsCount_desc, new Integer(size)));
-				}
-			}
-
-			buffer.append("</form>"); //$NON-NLS-1$
-			text.setText(buffer.toString(), true, false);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveShellSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveShellSection.java
deleted file mode 100644
index 7948493..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveShellSection.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-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.handlers.HandlerUtil;
-
-/**
- * @since 3.4
- */
-public class ActiveShellSection implements ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		final Shell shell = HandlerUtil.getActiveShell(event);
-		Object object = shell.getData();
-		if (object == null)
-			return;
-		Class clazz = object.getClass();
-
-		Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-		section.clientVerticalSpacing = 9;
-
-		section.setText(PDERuntimeMessages.SpyDialog_activeShell_title);
-
-		FormText text = toolkit.createFormText(section, true);
-		section.setClient(text);
-		TableWrapData td = new TableWrapData();
-		td.align = TableWrapData.FILL;
-		td.grabHorizontal = true;
-		section.setLayoutData(td);
-
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<form>"); //$NON-NLS-1$
-
-		buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.SpyDialog_activeShell_desc, new Class[] {clazz}));
-
-		buffer.append("</form>"); //$NON-NLS-1$
-		text.setText(buffer.toString(), true, false);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveWizardSection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveWizardSection.java
deleted file mode 100644
index 5fc3b50..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveWizardSection.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.pde.internal.runtime.PDERuntimePlugin;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-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.handlers.HandlerUtil;
-import org.osgi.framework.Bundle;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * @since 3.4
- */
-public class ActiveWizardSection implements ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event) {
-		final Shell shell = HandlerUtil.getActiveShell(event);
-		Object object = shell.getData();
-		if (object == null)
-			return;
-		Class clazz = object.getClass();
-
-		if (object instanceof WizardDialog) {
-			WizardDialog dialog = (WizardDialog) object;
-			IWizardPage page = dialog.getCurrentPage();
-			IWizard wizard = page.getWizard();
-			clazz = wizard.getClass();
-
-			Section section = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR);
-			section.clientVerticalSpacing = 9;
-
-			// the active wizard
-			FormText text = toolkit.createFormText(section, true);
-			section.setClient(text);
-			TableWrapData td = new TableWrapData();
-			td.align = TableWrapData.FILL;
-			td.grabHorizontal = true;
-			section.setLayoutData(td);
-
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("<form>"); //$NON-NLS-1$
-			section.setText(NLS.bind(PDERuntimeMessages.SpyDialog_activeWizard_title, wizard.getWindowTitle()));
-
-			buffer.append(toolkit.createClassSection(text, PDERuntimeMessages.SpyDialog_activeWizard_desc, new Class[] {clazz}));
-
-			PackageAdmin admin = PDERuntimePlugin.getDefault().getPackageAdmin();
-			Bundle bundle = admin.getBundle(clazz);
-			toolkit.generatePluginDetailsText(bundle, null, "wizard", buffer, text); //$NON-NLS-1$
-			buffer.append("</form>"); //$NON-NLS-1$
-
-			text.setText(buffer.toString(), true, false);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ISpySection.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ISpySection.java
deleted file mode 100644
index 7eb7761..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ISpySection.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.spy.sections;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * @since 3.4
- */
-public interface ISpySection {
-
-	public void build(ScrolledForm form, SpyFormToolkit toolkit, ExecutionEvent event);
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/.classpath b/ui/org.eclipse.pde.ui.templates/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/ui/org.eclipse.pde.ui.templates/.classpath
+++ /dev/null

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

diff --git a/ui/org.eclipse.pde.ui.templates/.cvsignore b/ui/org.eclipse.pde.ui.templates/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/ui/org.eclipse.pde.ui.templates/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-build.xml

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

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.ui.templates</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1a4cdbd..0000000
--- a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.core.resources.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Fri Oct 20 13:22:13 EDT 2006
-eclipse.preferences.version=1
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/default.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/implied.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/osname.aliases=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases=UTF-8
-encoding/<project>=ISO-8859-1

diff --git a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index db0772b..0000000
--- a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,341 +0,0 @@
-#Wed May 14 10:25:42 CDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-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=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4079175..0000000
--- a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,59 +0,0 @@
-#Sun Dec 23 21:49:35 CST 2007
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=99
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index af2b5ad..0000000
--- a/ui/org.eclipse.pde.ui.templates/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,24 +0,0 @@
-#Mon Aug 18 10:46:52 CDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1

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

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.pde.ui.templates;singleton:=true
-Bundle-Version: 3.4.400.qualifier
-Bundle-Vendor: %bundleVendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.pde.internal.ui.templates;x-internal:=true,
- org.eclipse.pde.internal.ui.templates.ide;x-internal:=true,
- org.eclipse.pde.internal.ui.templates.osgi;x-internal:=true,
- org.eclipse.pde.internal.ui.templates.rcp;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)"
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Bundle-Activator: org.eclipse.pde.internal.ui.templates.Activator
-Bundle-ActivationPolicy: lazy

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

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.templates/branding/bin/splash.bmp b/ui/org.eclipse.pde.ui.templates/branding/bin/splash.bmp
deleted file mode 100644
index d7d2e30..0000000
--- a/ui/org.eclipse.pde.ui.templates/branding/bin/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/build.properties b/ui/org.eclipse.pde.ui.templates/build.properties
deleted file mode 100644
index 433390e..0000000
--- a/ui/org.eclipse.pde.ui.templates/build.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               templates_3.0/,\
-               templates_3.1/,\
-               templates_3.2/,\
-               plugin.properties,\
-               icons/,\
-               branding/,\
-               about.html,\
-               templates_3.3/,\
-               templates_3.5/
-src.includes = about.html

diff --git a/ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.gif b/ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.gif
deleted file mode 100644
index b1526e9..0000000
--- a/ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.gif b/ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.gif
deleted file mode 100644
index 4e5f1cf..0000000
--- a/ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/plugin.properties b/ui/org.eclipse.pde.ui.templates/plugin.properties
deleted file mode 100644
index 4ddf287..0000000
--- a/ui/org.eclipse.pde.ui.templates/plugin.properties
+++ /dev/null

@@ -1,352 +0,0 @@
-###############################################################################
-#  Copyright (c) 2006, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-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.helloWorldCmd.name = Hello, World Command
-pluginContent.helloWorldCmd.description=\
-<p>This wizard creates standard plug-in directory structure and \
-adds the following:</p>\
-<li><b>Command contribution</b>. %template.helloWorldCmd.desc%</li>\
-<p><b>Extensions Used</b></p>\
-<li>org.eclipse.ui.commands</li>\
-<li>org.eclipse.ui.handlers</li>\
-<li>org.eclipse.ui.bindings</li>\
-<li>org.eclipse.ui.menus</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>\
-<li>org.eclipse.ui.perspectiveExtensions</li>\
-<li>org.eclipse.help.contexts</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 an 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.help.name = Plug-in with sample help content
-pluginContent.help.description=This wizard creates a plugin with a \
-sample standalone or integrated table of contents.\
-<p><b>Extensions Used</b></p>\
-<li>org.eclipse.help.toc</li>
-
-pluginContent.helloOSGiService.name = Dictionary OSGi Service
-pluginContent.helloOSGiService.description=\
-<p>This wizard creates an OSGi Service that registers and uses a simple dictionary service.</p>\
-<p><b>Imports Used</b></p>\
-<li>org.osgi.framework</li>\
-<li>org.osgi.util.tracker</li>\
-
-pluginContent.OSGiPreferencesService.name = Preferences OSGi Service Example
-pluginContent.OSGiPreferencesService.description=\
-<p>This wizard demonstrates basic usage of the OSGi Preferences Service.</p>\
-<p><b>Imports Used</b></p>\
-<li>org.osgi.framework</li>\
-<li>org.osgi.util.tracker</li>\
-<li>org.osgi.service.prefs</li>\
-
-pluginContent.OSGiSimpleLogService.name= OSGi Simple LogService Example
-pluginContent.OSGiSimpleLogService.description=\
-<p>This wizard creates and registers an OSGi Service that logs some messages.</p>\
-<p><b>Imports Used</b></p>\
-<li>org.osgi.framework</li>\
-<li>org.osgi.util.tracker</li>\
-<li>org.osgi.service.log</li>\
-
-
-newExtension.templates = Extension Templates
-newExtension.templates.hello.name = "Hello, World" action set
-newExtension.templates.hello.desc = <p>%template.helloWorld.desc%</p>
-
-newExtension.templates.helloCmd.name = "Hello, World" command contribution
-newExtension.templates.helloCmd.desc = <p>%template.helloWorldCmd.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 = Project Builder and Nature
-newExtension.templates.builder.desc = 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.  Select "Add|Remove Sample" Nature action from \
-a project context menu, to toggle the nature on a project.
-
-newExtension.templates.decorator.name = Icon Decorator
-newExtension.templates.decorator.desc = <p>%template.decorator.desc%</p>
-
-newExtension.templates.universalWelcome.name = Universal Welcome Contribution
-newExtension.templates.universalWelcome.desc = <p>%template.universalWelcome.desc%</p>
-
-newExtension.templates.importWizard.name = File Import Wizard
-newExtension.templates.importWizard.desc = <p>%template.importWizard.desc%</p>
-
-newExtension.template.commonNavigator.name = Common Navigator View
-newExtension.template.commonNavigator.desc = <p>%template.commonNavigator.desc%</p>
-
-template.commonNavigator.desc = This template creates a view implementing \
-the common navigator framework with workspace resources as its contents.
-
-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.helloWorldCmd.name = "Hello world" command contribution
-template.helloWorldCmd.desc = This template creates a simple command contribution \
-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.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.builder.name = Incremental Builder
-
-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 demonstrates implementation of \
-pop-up menu support, local tool bar, double-click, sorting and \
-filtering. There is also an option to add context-sensitive help \
-to the view.
-
-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.decorator.name = Icon Decorator
-template.decorator.desc = This template creates a simple <b>declarative</b> image decorator \
-<b>or</b> a more specific <b>class based</b> decorator. The declarative instance will add an \
-image to all files in the workspace and optionally to the project folders, while the class-based \
-example will only decorate Read-only files.
-
-template.importWizard.name = File Import Wizard
-template.importWizard.desc = This template creates a basic import wizard that imports \
-files from the local file system into a specified location in the workspace. \
-It also demonstrates how import categories are defined and how file extension filters are used.
-
-template.universalWelcome.name = Universal Welcome Contribution
-template.universalWelcome.desc = This template creates a link in one of sections of the Universal Welcome. \
-The product must be using Universal Welcome for this extension to work.
-
-template.perspective.name = Release Engineering Perspective
-template.perspective.desc = This template creates a release engineering themed perspective. \
-While most users will not be doing any release engineering, the theme allows for a very logical \
-layout of the perspective elements and demonstrates how to access the various team and CVS \
-components from within a perspective. 
-
-bundleVendor = Eclipse.org
-bundleName = PDE Templates
-
-wizard.name.splash.handler = Splash Handler
-wizard.description.splash.handler = This template will create a splash handler that contributes custom behavior to the splash screen.  Three types of splash screen handlers are available:  (1) Interactive:  A simulated log-in session; (2) Browser: An embedded HTML browser; (3) Extensible:  A dynamic set of image contributions.  All the necessary code, images, extensions, and extension points are created automatically.
-template.name.splash.handler = Splash Handler
-
-pluginContent.helloDSOSGIService.name=OSGi Declarative Services Example
-pluginContent.helloDSOSGIService.description=\
-<p>This wizard creates and registers an OSGi Service using <b>Declarative Services</b> that adds an additional command to the Equinox OSGi console.</p>\
-<p><b>Imports Used</b></p>\
-<li>org.osgi.framework</li>\
-<li>org.osgi.util.tracker</li>\
-<li>org.eclipse.osgi.framework.console</li>
-
-pluginContent.OSGiEventAdminService.name=OSGi EventAdmin Service Example
-pluginContent.OSGiEventAdminService.description=\
-<p>This wizard listens to an event topic using the OSGi <b>EventAdmin</b> Service.</p>\
-<p><b>Imports Used</b></p>\
-<li>org.osgi.framework</li>\
-<li>org.osgi.service.event</li>

diff --git a/ui/org.eclipse.pde.ui.templates/plugin.xml b/ui/org.eclipse.pde.ui.templates/plugin.xml
deleted file mode 100644
index 0d09430..0000000
--- a/ui/org.eclipse.pde.ui.templates/plugin.xml
+++ /dev/null

@@ -1,517 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.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>
-   <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.helloCmd.name"
-            template="org.eclipse.pde.ui.templates.helloWorldCmd"
-            icon="$nl$/icons/etool16/newex_wiz.gif"
-            category="templates"
-            id="org.eclipse.pde.ui.newExtension.helloCmd">
-         <description>
-            %newExtension.templates.helloCmd.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
-            category="templates"
-            icon="$nl$/icons/etool16/newex_wiz.gif"
-            id="org.eclipse.pde.ui.newExtension.commonNavigator"
-            name="%newExtension.template.commonNavigator.name"
-            template="org.eclipse.pde.ui.templates.commonNavigator">
-         <description>
-            %newExtension.template.commonNavigator.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
-            template="org.eclipse.pde.ui.templates.builder"
-            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>
-      <wizard
-            availableAsShortcut="true"
-            category="templates"
-            icon="$nl$/icons/etool16/newex_wiz.gif"
-            id="org.eclipse.pde.ui.newExtension.decorator"
-            name="%newExtension.templates.decorator.name"
-            template="org.eclipse.pde.ui.templates.decorator">
-         <description>
-            %newExtension.templates.decorator.desc
-         </description>
-      </wizard>
-      <wizard
-            availableAsShortcut="true"
-            category="templates"
-            icon="$nl$/icons/etool16/newex_wiz.gif"
-            id="org.eclipse.pde.ui.newExtension.importWizard"
-            name="%newExtension.templates.importWizard.name"
-            template="org.eclipse.pde.ui.templates.importWizard">
-         <description>
-            %newExtension.templates.importWizard.desc
-         </description>
-      </wizard>
-      <wizard
-            availableAsShortcut="true"
-            category="templates"
-            icon="$nl$/icons/etool16/newex_wiz.gif"
-            id="org.eclipse.pde.ui.newExtension.universalWelcome"
-            name="%newExtension.templates.universalWelcome.name"
-            template="org.eclipse.pde.ui.templates.universalWelcome">
-         <description>
-            %newExtension.templates.universalWelcome.desc
-         </description>
-      </wizard>
-      <wizard
-      		availableAsShortcut="true"
-            category="templates"
-            icon="$nl$/icons/etool16/newex_wiz.gif"
-            id="org.eclipse.pde.ui.newExtension.perspective"
-            name="%template.perspective.name"
-            template="org.eclipse.pde.ui.templates.perspective">
-		<description>
-		%template.perspective.desc
-		</description>
-      </wizard>
-      <wizard
-            availableAsShortcut="true"
-            category="templates"
-            icon="$nl$/icons/etool16/newex_wiz.gif"
-            id="org.eclipse.pde.ui.newExtension.splash"
-            name="%wizard.name.splash.handler"
-            template="org.eclipse.pde.ui.templates.splashHandlers">
-         <description>
-            %wizard.description.splash.handler
-         </description>
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.pde.ui.templates">
-      <template
-            contributingId="org.eclipse.ui.actionSets"
-            name="%template.helloWorld.name"
-            class="org.eclipse.pde.internal.ui.templates.ide.HelloWorldTemplate"
-            id="org.eclipse.pde.ui.templates.helloWorld">
-      </template>
-      <template
-            contributingId="org.eclipse.ui.commands"
-            name="%template.helloWorldCmd.name"
-            class="org.eclipse.pde.internal.ui.templates.ide.HelloWorldCmdTemplate"
-            id="org.eclipse.pde.ui.templates.helloWorldCmd">
-      </template>
-      <template
-            contributingId="org.eclipse.ui.propertyPages"
-            name="%template.propertyPages.name"
-            class="org.eclipse.pde.internal.ui.templates.ide.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.templates.ide.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.templates.ide.PopupMenuTemplate"
-            id="org.eclipse.pde.ui.templates.popup">
-      </template>
-      <template
-            class="org.eclipse.pde.internal.ui.templates.ide.CommonNavigatorTemplate"
-            contributingId="org.eclipse.ui.navigator.viewer"
-            id="org.eclipse.pde.ui.templates.commonNavigator"
-            name="%newExtension.template.commonNavigator.name">
-      </template>
-      <template
-            contributingId="org.eclipse.ui.views"
-            name="%template.view.name"
-            class="org.eclipse.pde.internal.ui.templates.ide.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.templates.ide.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.templates.ide.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.templates.ide.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.templates.ide.HelpTemplate"
-            id="org.eclipse.pde.ui.templates.help">
-      </template>
-      <template
-            class="org.eclipse.pde.internal.ui.templates.ide.DecoratorTemplate"
-            contributingId="org.eclipse.ui.decorators"
-            id="org.eclipse.pde.ui.templates.decorator"
-            name="%template.decorator.name"/>
-      <template
-            class="org.eclipse.pde.internal.ui.templates.ide.ImportWizardTemplate"
-            contributingId="org.eclipse.ui.importWizards"
-            id="org.eclipse.pde.ui.templates.importWizard"
-            name="%template.importWizard.name"/>
-      <template
-            class="org.eclipse.pde.internal.ui.templates.ide.UniversalWelcomeTemplate"
-            contributingId="org.eclipse.ui.intro.configExtension"
-            id="org.eclipse.pde.ui.templates.universalWelcome"
-            name="%template.universalWelcome.name"/>
-      <template
-			class="org.eclipse.pde.internal.ui.templates.ide.PerspectiveTemplate"
-			contributingId="org.eclipse.ui.perspectives"
-			id="org.eclipse.pde.ui.templates.perspective"
-			name="%template.perspective.name"/>
-      <template
-			class="org.eclipse.pde.internal.ui.templates.ide.BuilderTemplate"
-			contributingId="org.eclipse.core.resources.builders"
-			id="org.eclipse.pde.ui.templates.builder"
-			name="%template.builder.name"/>
-      <template
-            class="org.eclipse.pde.internal.ui.templates.ide.SplashHandlersTemplate"
-            contributingId="org.eclipse.ui.splashHandlers"
-            id="org.eclipse.pde.ui.templates.splashHandlers"
-            name="%template.name.splash.handler">
-      </template>
-   </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.templates.ide.HelloWorldNewWizard"
-            id="org.eclipse.pde.ui.pluginContent.helloWorld">
-         <description>
-            %pluginContent.helloWorld.description
-         </description>
-      </wizard>
-      <wizard
-            name="%pluginContent.helloWorldCmd.name"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            class="org.eclipse.pde.internal.ui.templates.ide.HelloWorldCmdNewWizard"
-            id="org.eclipse.pde.ui.pluginContent.helloWorldCmd">
-         <description>
-            %pluginContent.helloWorldCmd.description
-         </description>
-      </wizard>
-      <wizard
-            name="%pluginContent.intro.name"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            class="org.eclipse.pde.internal.ui.templates.rcp.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.templates.rcp.MailNewWizard"
-            id="org.eclipse.pde.ui.pluginContent.rcpmail"
-            requiresActivator="true"
-            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.templates.rcp.HelloRCPNewWizard"
-            id="org.eclipse.pde.ui.pluginContent.helloRCP"
-            rcp="true">
-         <description>
-            %pluginContent.helloRCP.description
-         </description>
-      </wizard>
-      <wizard
-            class="org.eclipse.pde.internal.ui.templates.rcp.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.templates.osgi.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.templates.rcp.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.templates.ide.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.templates.ide.MultiPageEditorNewWizard"
-            id="org.eclipse.pde.ui.pluginContent.multiPageEditor">
-         <description>
-            %pluginContent.multiPageEditor.description
-         </description>
-      </wizard>
-      <wizard
-            name="%pluginContent.propertyPages.name"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            class="org.eclipse.pde.internal.ui.templates.ide.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.templates.ide.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.templates.ide.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.templates.ide.BuilderNewWizard"
-            id="org.eclipse.pde.ui.pluginContent.builder">
-         <description>
-            %pluginContent.builder.description
-         </description>
-      </wizard>
-      <wizard
-            class="org.eclipse.pde.internal.ui.templates.ide.HelpNewWizard"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            id="org.eclipse.pde.ui.pluginContent.helpContent"
-            java="false"
-            name="%pluginContent.help.name"
-            requiresActivator="false"
-            ui-content="false">
-         <description>
-           %pluginContent.help.description
-         </description>
-      </wizard>
-      <wizard
-            class="org.eclipse.pde.internal.ui.templates.osgi.HelloOSGiServiceNewWizard"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            id="org.eclipse.pde.ui.pluginContent.helloOSGiService"
-            name="%pluginContent.helloOSGiService.name"
-            pureOSGi="true"
-            requiresActivator="true"
-            ui-content="false">
-         <description>
-			%pluginContent.helloOSGiService.description
-         </description>
-      </wizard>
-      <wizard
-            class="org.eclipse.pde.internal.ui.templates.osgi.OSGiPreferencesServiceNewWizard"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            id="org.eclipse.pde.ui.pluginContent.OSGiPreferencesService"
-            name="%pluginContent.OSGiPreferencesService.name"
-            pureOSGi="true"
-            requiresActivator="true"
-            ui-content="false">
-         <description>
-            %pluginContent.OSGiPreferencesService.description
-         </description>
-      </wizard>
-      <wizard
-            class="org.eclipse.pde.internal.ui.templates.osgi.OSGiSimpleLogServiceNewWizard"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            id="org.eclipse.pde.ui.pluginContent.OSGiSimpleLogService"
-            name="%pluginContent.OSGiSimpleLogService.name"
-            pureOSGi="true"
-            requiresActivator="true"
-            ui-content="false">
-         <description>
-            %pluginContent.OSGiSimpleLogService.description
-         </description>
-      </wizard>
-      <wizard
-            class="org.eclipse.pde.internal.ui.templates.osgi.HelloServiceComponentTemplateWizard"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            id="org.eclipse.pde.ui.ds.DSTemplateWizard"
-            name="%pluginContent.helloDSOSGIService.name"
-            pureOSGi="true"
-            requiresActivator="false"
-            ui-content="false">
-         <description>
-            %pluginContent.helloDSOSGIService.description
-         </description>
-      </wizard>
-      <wizard
-            class="org.eclipse.pde.internal.ui.templates.osgi.OSGiEventAdminTemplateWizard"
-            icon="$nl$/icons/etool16/newexprj_wiz.gif"
-            id="org.eclipse.pde.ui.ds.OSGiEventAdminTemplateWizard"
-            name="%pluginContent.OSGiEventAdminService.name"
-            pureOSGi="true"
-            requiresActivator="false"
-            ui-content="false">
-         <description>
-            %pluginContent.OSGiEventAdminService.description
-         </description>
-      </wizard>
-        
-   </extension>
-   
-</plugin>

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java
deleted file mode 100644
index 3d0f894..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates;
-
-import java.net.URL;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public class Activator extends AbstractUIPlugin {
-
-	// Shared instance
-	private static Activator fInstance;
-
-	public URL getInstallURL() {
-		return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-
-	public static Activator getDefault() {
-		return fInstance;
-	}
-
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		fInstance = this;
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		fInstance = null;
-		super.stop(context);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/IHelpContextIds.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/IHelpContextIds.java
deleted file mode 100644
index 44197ea..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/IHelpContextIds.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates;
-
-public interface IHelpContextIds {
-
-	public static final String PREFIX = "org.eclipse.pde.doc.user."; //$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 TEMPLATE_UNIVERSAL_WELCOME = PREFIX + "template_universal_welcome"; //$NON-NLS-1$
-	// TODO: MP: SPLASH: Update help context ID
-	public static final String TEMPLATE_SPLASH_HANDLERS = PREFIX + "splash_handlers"; //$NON-NLS-1$
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java
deleted file mode 100644
index 10cb59c..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java
+++ /dev/null

@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Code 9 Corporation - ongoing development
- *     Volker Wegert - bug 243087
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates;
-
-import org.eclipse.osgi.util.NLS;
-
-public class PDETemplateMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ui.templates.pderesources"; //$NON-NLS-1$
-
-	public static String HelpTemplate_sampleText;
-	public static String HelpNewWizard_wiz;
-
-	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_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 HelloWorldCmdNewWizard_wtitle;
-	public static String HelloWorldCmdTemplate_title;
-	public static String HelloWorldCmdTemplate_desc;
-	public static String HelloWorldCmdTemplate_packageName;
-	public static String HelloWorldCmdTemplate_className;
-	public static String HelloWorldCmdTemplate_messageText;
-	public static String HelloWorldCmdTemplate_defaultMessage;
-	public static String HelloWorldCmdTemplate_sampleCategory;
-	public static String HelloWorldCmdTemplate_sampleMenu_name;
-	public static String HelloWorldCmdTemplate_sampleMenu_mnemonic;
-	public static String HelloWorldCmdTemplate_sampleAction_name;
-	public static String HelloWorldCmdTemplate_sampleAction_mnemonic;
-	public static String HelloWorldCmdTemplate_sampleAction_tooltip;
-
-	public static String IntroNewWizard_wtitle;
-	public static String IntroTemplate_title;
-	public static String IntroTemplate_desc;
-	public static String IntroTemplate_productName;
-	public static String IntroTemplate_generate;
-	public static String IntroTemplate_generateDynamicContent;
-	public static String IntroTemplate_generateStaticContent;
-
-	public static String SplashHandlersTemplate_descSplashHandlerOptions;
-
-	public static String SplashHandlersTemplate_fieldAddSplash;
-
-	public static String SplashHandlersTemplate_fieldClassName;
-
-	public static String SplashHandlersTemplate_fieldJavaPackage;
-
-	public static String SplashHandlersTemplate_fieldProductID;
-
-	public static String SplashHandlersTemplate_fieldSplashScreenType;
-
-	public static String SplashHandlersTemplate_titleSplashHandlerOptions;
-
-	public static String ViewRCPNewWizard_title;
-	public static String ViewRCPTemplate_title;
-	public static String ViewRCPTemplate_desc;
-	public static String ViewRCPTemplate_appClass;
-	public static String ViewRCPTemplate_packageName;
-	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 PopupMenuNewWizard_wtitle;
-	public static String PopupMenuTemplate_title;
-	public static String PopupMenuTemplate_desc;
-	public static String PopupMenuTemplate_targetClass;
-	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 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 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 ViewNewWizard_wtitle;
-	public static String ViewTemplate_title0;
-	public static String ViewTemplate_desc0;
-	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_contextHelp;
-	public static String ViewTemplate_addToPerspective;
-	public static String ViewTemplate_addViewID;
-
-	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 DecoratorTemplate_title;
-	public static String DecoratorTemplate_desc;
-	public static String DecoratorTemplate_packageName;
-	public static String DecoratorTemplate_placement;
-	public static String DecoratorTemplate_resourceLabel;
-	public static String DecoratorTemplate_readOnlyLabel;
-	public static String DecoratorTemplate_decorateProject;
-	public static String DecoratorTemplate_decorateReadOnly;
-	public static String DecoratorTemplate_placementChoices;
-	public static String DecoratorTemplate_decoratorClass;
-
-	public static String ImportWizardTemplate_title;
-	public static String ImportWizardTemplate_desc;
-	public static String ImportWizardTemplate_packageName;
-	public static String ImportWizardTemplate_wizardClass;
-	public static String ImportWizardTemplate_wizardClassName;
-	public static String ImportWizardTemplate_importWizardCategory;
-	public static String ImportWizardTemplate_importWizardCategoryName;
-	public static String ImportWizardTemplate_pageClass;
-	public static String ImportWizardTemplate_pageClassName;
-	public static String ImportWizardTemplate_wizardName;
-	public static String ImportWizardTemplate_wizardDefaultName;
-	public static String ImportWizardTemplate_filterChoices;
-	public static String ImportWizardTemplate_filters;
-	public static String ImportWizardTemplate_wizardDescription;
-
-	public static String MailTemplate_title;
-	public static String MailNewWizard_title;
-	public static String MailTemplate_desc;
-
-	public static String MailTemplate_productName;
-	public static String MailTemplate_appClass;
-	public static String MailTemplate_packageName;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, PDETemplateMessages.class);
-	}
-
-	public static String HelloRCPTemplate_productBranding;
-
-	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 HelloOSGiServiceTemplate_howdy;
-	public static String HelloOSGiTemplate_goodbye;
-	public static String HelloOSGiTemplate_hello;
-
-	public static String UniversalWelcomeTemplate_key_directoryName;
-	public static String UniversalWelcomeTemplate_key_targetPage;
-	public static String UniversalWelcomeTemplate_page_Overview;
-	public static String UniversalWelcomeTemplate_page_Tutorials;
-	public static String UniversalWelcomeTemplate_page_FirstSteps;
-	public static String UniversalWelcomeTemplate_page_Samples;
-	public static String UniversalWelcomeTemplate_page_Whatsnew;
-	public static String UniversalWelcomeTemplate_page_Migrate;
-	public static String UniversalWelcomeTemplate_page_WebResources;
-	public static String UniversalWelcomeTemplate_linkUrl;
-
-	// Hello world OSGi Service template
-	public static String HelloOSGiServiceTemplate_greeting;
-	public static String HelloOSGiServiceTemplate_word1;
-	public static String HelloOSGiServiceTemplate_word2;
-	public static String HelloOSGiServiceTemplate_word3;
-	public static String HelloOSGiServiceTemplate_pageDescription;
-	public static String HelloOSGiServiceTemplate_pageTitle;
-	public static String HelloOSGiServiceNewWizard_title;
-
-	// DS OSGi Service template
-	public static String DSTemplate_pageDescription;
-	public static String DSTemplate_pageTitle;
-	public static String DSTemplateWizard_title;
-
-	// Perspective Template
-	public static String PerspectiveTemplate_title;
-	public static String PerspectiveTemplate_desc;
-	public static String PerspectiveTemplate_packageName;
-	public static String PerspectiveTemplate_perspectiveClass;
-	public static String PerspectiveTemplate_perspectiveClassName;
-	public static String PerspectiveTemplate_perspective;
-	public static String PerspectiveTemplate_perspectiveName;
-	public static String PerspectiveTemplate_perspectiveShortcuts;
-	public static String PerspectiveTemplate_showViewShortcuts;
-	public static String PerspectiveTemplate_newWizardShortcuts;
-	public static String PerspectiveTemplate_actionSets;
-
-	// Preferences Service Template
-	public static String OSGiPreferencesServiceNewWizard_title;
-	public static String OSGiPreferencesServiceTemplate_label;
-	public static String OSGiPreferencesServiceTemplate_pageTitle;
-	public static String OSGiPreferencesServiceTemplate_pageDescription;
-	public static String OSGiPreferencesServiceTemplate_value;
-
-	// OSGi Log Service Template
-	public static String OSGiSimpleLogServiceNewWizard_title;
-	public static String OSGiSimpleLogServiceTemplate_logMessage;
-	public static String OSGiSimpleLogServiceTemplate_pageDescription;
-	public static String OSGiSimpleLogServiceTemplate_pageTitle;
-	public static String OSGiSimpleLogServiceTemplate_startLogMessage;
-	public static String OSGiSimpleLogServiceTemplate_stopLogMessage;
-
-	// Common Navigator Template
-	public static String CommonNavigatorTemplate_viewId;
-	public static String CommonNavigatorTemplate_viewName;
-	public static String CommonNavigatorTemplate_addToPerspective;
-	public static String CommonNavigatorTemplate_defaultViewName;
-	public static String CommonNavigatorTemplate_pagedescription;
-	public static String CommonNavigatorTemplate_pagetitle;
-
-	// Declarative Services Template
-	public static String HelloServiceComponentTemplate_command;
-	public static String HelloServiceComponentTemplate_commandTitle;
-
-	// Declarative Services Template
-	public static String OSGiEventAdminTemplate_eventTopicTitle;
-	public static String OSGiEventAdminTemplateWizard_title;
-	public static String OSGiEventAdminTemplate_pageTitle;
-	public static String OSGiEventAdminTemplate_pageDescription;
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
deleted file mode 100644
index 14619f5..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.ui.templates.OptionTemplateSection;
-import org.osgi.framework.Bundle;
-
-public abstract class PDETemplateSection extends OptionTemplateSection {
-
-	public static final String KEY_PRODUCT_BRANDING = "productBranding"; //$NON-NLS-1$
-	public static final String KEY_PRODUCT_NAME = "productName"; //$NON-NLS-1$
-
-	public static final String VALUE_PRODUCT_ID = "product"; //$NON-NLS-1$
-	public static final String VALUE_PRODUCT_NAME = "RCP Product"; //$NON-NLS-1$
-	public static final String VALUE_PERSPECTIVE_NAME = "RCP Perspective"; //$NON-NLS-1$
-	public static final String VALUE_APPLICATION_ID = "application"; //$NON-NLS-1$
-
-	protected ResourceBundle getPluginResourceBundle() {
-		Bundle bundle = Platform.getBundle(Activator.getPluginId());
-		return Platform.getResourceBundle(bundle);
-	}
-
-	protected URL getInstallURL() {
-		return Activator.getDefault().getInstallURL();
-	}
-
-	public URL getTemplateLocation() {
-		try {
-			String[] candidates = getDirectoryCandidates();
-			for (int i = 0; i < candidates.length; i++) {
-				if (Activator.getDefault().getBundle().getEntry(candidates[i]) != null) {
-					URL candidate = new URL(getInstallURL(), candidates[i]);
-					return candidate;
-				}
-			}
-		} catch (MalformedURLException e) { // do nothing
-		}
-		return null;
-	}
-
-	private String[] getDirectoryCandidates() {
-		double version = getTargetVersion();
-		ArrayList result = new ArrayList();
-		if (version >= 3.6)
-			result.add("templates_3.6" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if (version >= 3.5)
-			result.add("templates_3.5" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if (version >= 3.4)
-			result.add("templates_3.4" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if (version >= 3.3)
-			result.add("templates_3.3" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if (version >= 3.2)
-			result.add("templates_3.2" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if (version >= 3.1)
-			result.add("templates_3.1" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if (version >= 3.0)
-			result.add("templates_3.0" + "/" + getSectionId() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-
-	/* (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);
-	}
-
-	protected void generateFiles(IProgressMonitor monitor) throws CoreException {
-		super.generateFiles(monitor);
-		// Copy the default splash screen if the branding option is selected
-		if (copyBrandingDirectory()) {
-			super.generateFiles(monitor, Activator.getDefault().getBundle().getEntry("branding/")); //$NON-NLS-1$
-		}
-	}
-
-	protected boolean copyBrandingDirectory() {
-		return getBooleanOption(KEY_PRODUCT_BRANDING);
-	}
-
-	protected void createBrandingOptions() {
-		addOption(KEY_PRODUCT_BRANDING, PDETemplateMessages.HelloRCPTemplate_productBranding, false, 0);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java
deleted file mode 100644
index a06aec4..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2003, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-
-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.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java
deleted file mode 100644
index b18a92c..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-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(PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
deleted file mode 100644
index 91af7ea..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
+++ /dev/null

@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.AbstractTemplateSection;
-import org.eclipse.pde.ui.templates.BooleanOption;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-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, PDETemplateMessages.BuilderTemplate_packageLabel, (String) null, 0);
-
-		addOption(KEY_BUILDER_CLASS_NAME, PDETemplateMessages.BuilderTemplate_builderClass, "SampleBuilder", 0); //$NON-NLS-1$
-		addOption(KEY_BUILDER_ID, PDETemplateMessages.BuilderTemplate_builderId, "sampleBuilder", 0); //$NON-NLS-1$
-		addOption(KEY_BUILDER_NAME, PDETemplateMessages.BuilderTemplate_builderName, PDETemplateMessages.BuilderTemplate_defaultBuilderName, 0);
-
-		addOption(KEY_NATURE_CLASS_NAME, PDETemplateMessages.BuilderTemplate_natureClass, "SampleNature", 0); //$NON-NLS-1$
-		addOption(KEY_NATURE_ID, PDETemplateMessages.BuilderTemplate_natureId, "sampleNature", 0); //$NON-NLS-1$
-		addOption(KEY_NATURE_NAME, PDETemplateMessages.BuilderTemplate_natureName, PDETemplateMessages.BuilderTemplate_defaultNatureName, 0);
-
-		actionOption = (BooleanOption) addOption(KEY_GEN_ACTION, PDETemplateMessages.BuilderTemplate_generateAction, true, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_BUILDER);
-		page.setTitle(PDETemplateMessages.BuilderTemplate_title);
-		page.setDescription(PDETemplateMessages.BuilderTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	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 "org.eclipse.core.resources.builders"; //$NON-NLS-1$
-	}
-
-	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", PDETemplateMessages.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(PDETemplateMessages.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;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getLabel()
-	 */
-	public String getLabel() {
-		return getPluginResourceString("newExtension.templates.builder.name"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getDescription()
-	 */
-	public String getDescription() {
-		return getPluginResourceString("newExtension.templates.builder.desc"); //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
deleted file mode 100644
index d6df37f..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cypal Solutions.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Cypal Solutions - initial implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.*;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.templates.BooleanOption;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-/**
- * Template for a new view implementing the common navigator framework.
- */
-public class CommonNavigatorTemplate extends PDETemplateSection {
-
-	public static final String KEY_VIEW_ID = "viewId"; //$NON-NLS-1$
-	public static final String KEY_VIEW_NAME = "viewName"; //$NON-NLS-1$
-	public static final String KEY_ADD_TO_PERSPECTIVE = "addToPerspective"; //$NON-NLS-1$
-
-	private BooleanOption addToPerspective;
-	private IPluginBase plugin;
-	private IPluginModelFactory factory;
-	private String viewId;
-
-	public CommonNavigatorTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	private void createOptions() {
-		addOption(KEY_VIEW_ID, PDETemplateMessages.CommonNavigatorTemplate_viewId, "com.example.test", 0); //$NON-NLS-1$
-		addOption(KEY_VIEW_NAME, PDETemplateMessages.CommonNavigatorTemplate_viewName, PDETemplateMessages.CommonNavigatorTemplate_defaultViewName, 0);
-		addToPerspective = (BooleanOption) addOption(KEY_ADD_TO_PERSPECTIVE, PDETemplateMessages.CommonNavigatorTemplate_addToPerspective, true, 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "commonNavigator"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		plugin = model.getPluginBase();
-		factory = model.getPluginFactory();
-		viewId = getStringOption(KEY_VIEW_ID);
-
-		createView();
-		createViewer();
-
-		if (addToPerspective.isSelected()) {
-			createAddToPerspective();
-		}
-	}
-
-	private void createAddToPerspective() throws CoreException {
-		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", viewId); //$NON-NLS-1$
-		view.setAttribute("relative", "org.eclipse.ui.navigator.ProjectExplorer"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("relationship", "stack"); //$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 createViewer() throws CoreException {
-		IPluginExtension viewerExtension = createExtension("org.eclipse.ui.navigator.viewer", true); //$NON-NLS-1$
-		if (!viewerExtension.isInTheModel())
-			plugin.add(viewerExtension);
-
-		createActionBinding(viewerExtension);
-		createContentBinding(viewerExtension);
-	}
-
-	private void createContentBinding(IPluginExtension viewerExtension) throws CoreException {
-		IPluginElement viewerContentBindingElement = factory.createElement(viewerExtension);
-		viewerContentBindingElement.setName("viewerContentBinding"); //$NON-NLS-1$
-		viewerContentBindingElement.setAttribute("viewerId", viewId); //$NON-NLS-1$
-
-		IPluginElement includesElement = factory.createElement(viewerContentBindingElement);
-		includesElement.setName("includes"); //$NON-NLS-1$
-		createChild(includesElement, "contentExtension", "pattern", "org.eclipse.ui.navigator.resourceContent"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		createChild(includesElement, "contentExtension", "pattern", "org.eclipse.ui.navigator.resources.filters.*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		createChild(includesElement, "contentExtension", "pattern", "org.eclipse.ui.navigator.resources.linkHelper"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		createChild(includesElement, "contentExtension", "pattern", "org.eclipse.ui.navigator.resources.workingSets"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		viewerContentBindingElement.add(includesElement);
-		viewerExtension.add(viewerContentBindingElement);
-	}
-
-	private void createActionBinding(IPluginExtension viewerExtension) throws CoreException {
-		IPluginElement viewerActionBindingElement = factory.createElement(viewerExtension);
-		viewerActionBindingElement.setName("viewerActionBinding"); //$NON-NLS-1$
-		viewerActionBindingElement.setAttribute("viewerId", viewId); //$NON-NLS-1$
-
-		IPluginElement includesElement = factory.createElement(viewerActionBindingElement);
-		includesElement.setName("includes"); //$NON-NLS-1$
-
-		createChild(includesElement, "actionExtension", "pattern", "org.eclipse.ui.navigator.resources.*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		viewerActionBindingElement.add(includesElement);
-		viewerExtension.add(viewerActionBindingElement);
-	}
-
-	private void createChild(IPluginElement parent, String name, String attrName, String attrValue) throws CoreException {
-		IPluginElement child = factory.createElement(parent);
-		child.setName(name);
-		child.setAttribute(attrName, attrValue);
-		parent.add(child);
-	}
-
-	private void createView() throws CoreException {
-		IPluginExtension viewExtension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
-		IPluginElement viewElement = factory.createElement(viewExtension);
-		viewElement.setName("view"); //$NON-NLS-1$
-		viewElement.setAttribute("id", viewId); //$NON-NLS-1$
-		viewElement.setAttribute("name", getStringOption(KEY_VIEW_NAME)); //$NON-NLS-1$
-		viewElement.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		viewElement.setAttribute("class", "org.eclipse.ui.navigator.CommonNavigator"); //$NON-NLS-1$  //$NON-NLS-2$
-		viewExtension.add(viewElement);
-		if (!viewExtension.isInTheModel())
-			plugin.add(viewExtension);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		return new String[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.navigator.CommonNavigator"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
-	 */
-	public void addPages(Wizard wizard) {
-		WizardPage page0 = createPage(0);
-		page0.setTitle(PDETemplateMessages.CommonNavigatorTemplate_pagetitle);
-		page0.setDescription(PDETemplateMessages.CommonNavigatorTemplate_pagedescription);
-		wizard.addPage(page0);
-
-		markPagesAdded();
-	}
-
-	/* (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.navigator", null, 0)); //$NON-NLS-1$
-		result.add(new PluginReference("org.eclipse.ui.navigator.resources", null, 0)); //$NON-NLS-1$
-		return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java
deleted file mode 100644
index 2ce8118..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java
+++ /dev/null

@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import java.io.File;
-import java.util.StringTokenizer;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.BooleanOption;
-import org.eclipse.pde.ui.templates.PluginReference;
-import org.eclipse.pde.ui.templates.TemplateOption;
-
-public class DecoratorTemplate extends PDETemplateSection {
-	public static final String DECORATOR_CLASS_NAME = "decoratorClassName"; //$NON-NLS-1$
-	public static final String DECORATOR_ICON_PLACEMENT = "decoratorPlacement"; //$NON-NLS-1$
-	public static final String DECORATOR_BLN_PROJECT = "decorateProjects"; //$NON-NLS-1$
-	public static final String DECORATOR_BLN_READONLY = "decorateReadOnly"; //$NON-NLS-1$
-
-	private WizardPage page;
-	private TemplateOption packageOption;
-	private TemplateOption classOption;
-	private BooleanOption projectOption;
-	private BooleanOption readOnlyOption;
-
-	/**
-	 * Constructor for DecoratorTemplate.
-	 */
-	public DecoratorTemplate() {
-		setPageCount(1);
-		createOptions();
-		alterOptionStates();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		// Additional dependency required to decorate resource objects
-		if (schemaVersion != null) {
-			IPluginReference[] dep = new IPluginReference[1];
-			dep[0] = new PluginReference("org.eclipse.core.resources", null, 0); //$NON-NLS-1$
-			return dep;
-		}
-		return super.getDependencies(schemaVersion);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getDirectoryCandidates()
-	 */
-	public String getSectionId() {
-		// Identifier used for the folder name within the templates_3.X
-		// hierarchy  and as part of the lookup key for the template label
-		// variable.
-		return "decorator"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	/**
-	 * Creates the options to be displayed on the template wizard.
-	 * A multiple choice option (radio buttons) and a boolean option
-	 * are used.
-	 */
-	private void createOptions() {
-		String[][] choices = fromCommaSeparated(PDETemplateMessages.DecoratorTemplate_placementChoices);
-
-		addOption(DECORATOR_ICON_PLACEMENT, PDETemplateMessages.DecoratorTemplate_placement, choices, choices[0][0], 0);
-
-		projectOption = (BooleanOption) addOption(DECORATOR_BLN_PROJECT, PDETemplateMessages.DecoratorTemplate_decorateProject, true, 0);
-
-		readOnlyOption = (BooleanOption) addOption(DECORATOR_BLN_READONLY, PDETemplateMessages.DecoratorTemplate_decorateReadOnly, false, 0);
-
-		packageOption = addOption(KEY_PACKAGE_NAME, PDETemplateMessages.DecoratorTemplate_packageName, (String) null, 0);
-		classOption = addOption(DECORATOR_CLASS_NAME, PDETemplateMessages.DecoratorTemplate_decoratorClass, "ReadOnly", //$NON-NLS-1$
-				0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
-	 */
-	public void addPages(Wizard wizard) {
-		int pageIndex = 0;
-
-		page = createPage(pageIndex, IHelpContextIds.TEMPLATE_EDITOR);
-		page.setTitle(PDETemplateMessages.DecoratorTemplate_title);
-		page.setDescription(PDETemplateMessages.DecoratorTemplate_desc);
-
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void alterOptionStates() {
-		projectOption.setEnabled(!readOnlyOption.isSelected());
-		packageOption.setEnabled(!projectOption.isEnabled());
-		classOption.setEnabled(!projectOption.isEnabled());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFolder(java.io.File)
-	 */
-	protected boolean isOkToCreateFolder(File sourceFolder) {
-		//Define rules for creating folders from the Templates_3.X folders
-		boolean isOk = true;
-		String folderName = sourceFolder.getName();
-		if (folderName.equals("java")) { //$NON-NLS-1$
-			isOk = readOnlyOption.isEnabled() && readOnlyOption.isSelected();
-		}
-		return isOk;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFile(java.io.File)
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-		//Define rules for creating files from the Templates_3.X folders
-		boolean isOk = true;
-		String fileName = sourceFile.getName();
-		if (fileName.equals("read_only.gif")) { //$NON-NLS-1$
-			isOk = readOnlyOption.isEnabled() && readOnlyOption.isSelected();
-		} else if (fileName.equals("sample_decorator.gif")) { //$NON-NLS-1$
-			isOk = !readOnlyOption.isSelected();
-		} else if (fileName.equals("$decoratorClassName$.java")) { //$NON-NLS-1$
-			isOk = readOnlyOption.isEnabled() && readOnlyOption.isSelected();
-		}
-		return isOk;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source == readOnlyOption) {
-			alterOptionStates();
-		}
-		super.validateOptions(source);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
-	 */
-	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));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
-	 */
-	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.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		// This method creates the extension point structure through the use
-		// of IPluginElement objects. The element attributes are set based on
-		// user input from the wizard page as well as values required for the 
-		// operation of the extension point.
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement decoratorElement = factory.createElement(extension);
-		decoratorElement.setName("decorator"); //$NON-NLS-1$
-		decoratorElement.setAttribute("adaptable", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		decoratorElement.setAttribute("state", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		decoratorElement.setAttribute("lightweight", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		if (!readOnlyOption.isSelected()) {
-			decoratorElement.setAttribute("id", plugin.getId() + "." + getSectionId()); //$NON-NLS-1$ //$NON-NLS-2$
-			decoratorElement.setAttribute("label", PDETemplateMessages.DecoratorTemplate_resourceLabel); //$NON-NLS-1$		
-			decoratorElement.setAttribute("icon", "icons/sample_decorator.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-			decoratorElement.setAttribute("location", getValue(DECORATOR_ICON_PLACEMENT).toString()); //$NON-NLS-1$
-		} else {
-			decoratorElement.setAttribute("id", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(DECORATOR_CLASS_NAME)); //$NON-NLS-1$ //$NON-NLS-2$
-			decoratorElement.setAttribute("label", PDETemplateMessages.DecoratorTemplate_readOnlyLabel); //$NON-NLS-1$		
-			decoratorElement.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(DECORATOR_CLASS_NAME)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		IPluginElement enablementElement = factory.createElement(decoratorElement);
-		enablementElement.setName("enablement"); //$NON-NLS-1$
-
-		IPluginElement andElement = factory.createElement(enablementElement);
-		andElement.setName("and"); //$NON-NLS-1$
-
-		IPluginElement resourceObjectElement = factory.createElement(andElement);
-		resourceObjectElement.setName("objectClass"); //$NON-NLS-1$
-		resourceObjectElement.setAttribute("name", "org.eclipse.core.resources.IResource"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement orElement = factory.createElement(andElement);
-		orElement.setName("or"); //$NON-NLS-1$
-
-		IPluginElement fileObjectElement = factory.createElement(orElement);
-		fileObjectElement.setName("objectClass"); //$NON-NLS-1$
-		fileObjectElement.setAttribute("name", "org.eclipse.core.resources.IFile"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement folderObjectElement = factory.createElement(orElement);
-		folderObjectElement.setName("objectClass"); //$NON-NLS-1$
-		folderObjectElement.setAttribute("name", "org.eclipse.core.resources.IFolder"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement projectObjectElement = factory.createElement(orElement);
-		projectObjectElement.setName("objectClass"); //$NON-NLS-1$
-		projectObjectElement.setAttribute("name", "org.eclipse.core.resources.IProject"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		if (readOnlyOption.isSelected())
-			orElement.add(folderObjectElement);
-		else if (projectOption.isSelected())
-			orElement.add(projectObjectElement);
-		orElement.add(fileObjectElement);
-		andElement.add(resourceObjectElement);
-		andElement.add(orElement);
-		enablementElement.add(andElement);
-		decoratorElement.add(enablementElement);
-
-		extension.add(decoratorElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/"}; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
-	 */
-	protected String getFormattedPackageName(String id) {
-		// Package name addition to create a location for containing
-		// any classes required by the decorator. 
-		String packageName = super.getFormattedPackageName(id);
-		if (packageName.length() != 0)
-			return packageName + ".decorators"; //$NON-NLS-1$
-		return "decorators"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.decorators"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns a 2-D String array based on a comma seperated
-	 * string of choices. 
-	 * 
-	 * @param iconLocations
-	 * 				comma seperated string of icon placement options
-	 * @return the 2-D array of choices
-	 * 				
-	 */
-	protected String[][] fromCommaSeparated(String iconLocations) {
-		StringTokenizer tokens = new StringTokenizer(iconLocations, ","); //$NON-NLS-1$
-		String[][] choices = new String[tokens.countTokens() / 2][2];
-		int x = 0, y = 0;
-		while (tokens.hasMoreTokens()) {
-			choices[x][y++] = tokens.nextToken();
-			choices[x++][y--] = tokens.nextToken();
-		}
-		return choices;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java
deleted file mode 100644
index 0471c6f..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class EditorNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for EditorNewWizard.
-	 */
-	public EditorNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.EditorNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new EditorTemplate()};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java
deleted file mode 100644
index 4e2ba09..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-import org.eclipse.pde.ui.templates.TemplateOption;
-
-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[4];
-			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$
-			return dep;
-		}
-		return super.getDependencies(schemaVersion);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_EDITOR);
-		page.setTitle(PDETemplateMessages.EditorTemplate_title);
-		page.setDescription(PDETemplateMessages.EditorTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		// first page	
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.EditorTemplate_packageName, (String) null, 0);
-		addOption(EDITOR_CLASS_NAME, PDETemplateMessages.EditorTemplate_editorClass, "XMLEditor", //$NON-NLS-1$
-				0);
-		addOption(EDITOR_NAME, PDETemplateMessages.EditorTemplate_editorName, PDETemplateMessages.EditorTemplate_defaultEditorName, 0);
-		addOption(EXTENSIONS, PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java
deleted file mode 100644
index 0d37401..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class HelloWorldCmdNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for HelloWorldNewWizard.
-	 */
-	public HelloWorldCmdNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.HelloWorldCmdNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloWorldCmdTemplate()};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java
deleted file mode 100644
index cdbd444..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.internal.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.ui.contexts.IContextService;
-import org.eclipse.ui.keys.IBindingService;
-
-public class HelloWorldCmdTemplate 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 = "SampleHandler"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for HelloWorldTemplate.
-	 */
-	public HelloWorldCmdTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	public String getSectionId() {
-		return "helloWorldCmd"; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	private void createOptions() {
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.HelloWorldCmdTemplate_packageName, (String) null, 0);
-		addOption(KEY_CLASS_NAME, PDETemplateMessages.HelloWorldCmdTemplate_className, CLASS_NAME, 0);
-		addOption(KEY_MESSAGE, PDETemplateMessages.HelloWorldCmdTemplate_messageText, PDETemplateMessages.HelloWorldCmdTemplate_defaultMessage, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_HELLO_WORLD);
-		page.setTitle(PDETemplateMessages.HelloWorldCmdTemplate_title);
-		page.setDescription(PDETemplateMessages.HelloWorldCmdTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	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.commands"; //$NON-NLS-1$
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension commandsExtension = createExtension("org.eclipse.ui.commands", true); //$NON-NLS-1$
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement category = factory.createElement(commandsExtension);
-		category.setName("category"); //$NON-NLS-1$
-		String categoryId = plugin.getId() + ".commands.category"; //$NON-NLS-1$
-		category.setAttribute("id", categoryId); //$NON-NLS-1$ 
-		category.setAttribute("name", PDETemplateMessages.HelloWorldCmdTemplate_sampleCategory); //$NON-NLS-1$
-		commandsExtension.add(category);
-
-		IPluginElement command = factory.createElement(commandsExtension);
-		command.setName("command"); //$NON-NLS-1$
-		command.setAttribute("categoryId", categoryId); //$NON-NLS-1$
-		command.setAttribute("name", //$NON-NLS-1$
-				PDETemplateMessages.HelloWorldCmdTemplate_sampleAction_name);
-		String commandId = plugin.getId() + ".commands.sampleCommand"; //$NON-NLS-1$
-		command.setAttribute("id", commandId); //$NON-NLS-1$
-		commandsExtension.add(command);
-
-		String fullClassName = getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_CLASS_NAME); //$NON-NLS-1$
-		IPluginExtension handlersExtension = createExtension("org.eclipse.ui.handlers", true); //$NON-NLS-1$
-		IPluginElement handler = factory.createElement(handlersExtension);
-		handler.setName("handler"); //$NON-NLS-1$
-		handler.setAttribute("class", fullClassName); //$NON-NLS-1$
-		handler.setAttribute("commandId", commandId); //$NON-NLS-1$
-		handlersExtension.add(handler);
-
-		IPluginExtension bindingsExtension = createExtension("org.eclipse.ui.bindings", true); //$NON-NLS-1$
-		IPluginElement binding = factory.createElement(bindingsExtension);
-		binding.setName("key"); //$NON-NLS-1$
-		binding.setAttribute("commandId", commandId); //$NON-NLS-1$
-		binding.setAttribute("schemeId", IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID); //$NON-NLS-1$
-		binding.setAttribute("contextId", IContextService.CONTEXT_ID_WINDOW); //$NON-NLS-1$
-		binding.setAttribute("sequence", "M1+6"); //$NON-NLS-1$ //$NON-NLS-2$
-		bindingsExtension.add(binding);
-
-		IPluginExtension menusExtension = createExtension("org.eclipse.ui.menus", true); //$NON-NLS-1$
-		IPluginElement menuAddition = factory.createElement(menusExtension);
-		menuAddition.setName("menuContribution"); //$NON-NLS-1$
-		menuAddition.setAttribute("locationURI", //$NON-NLS-1$
-				"menu:org.eclipse.ui.main.menu?after=additions"); //$NON-NLS-1$
-		IPluginElement menu = factory.createElement(menuAddition);
-		menu.setName("menu"); //$NON-NLS-1$
-		String menuId = plugin.getId() + ".menus.sampleMenu"; //$NON-NLS-1$
-		menu.setAttribute("id", menuId); //$NON-NLS-1$
-		menu.setAttribute("label", //$NON-NLS-1$
-				PDETemplateMessages.HelloWorldCmdTemplate_sampleMenu_name);
-		menu.setAttribute("mnemonic", //$NON-NLS-1$
-				PDETemplateMessages.HelloWorldCmdTemplate_sampleMenu_mnemonic);
-		IPluginElement menuCommand = factory.createElement(menu);
-		menuCommand.setName("command"); //$NON-NLS-1$
-		menuCommand.setAttribute("commandId", commandId); //$NON-NLS-1$
-		menuCommand.setAttribute("id", plugin.getId() + ".menus.sampleCommand"); //$NON-NLS-1$ //$NON-NLS-2$
-		menuCommand.setAttribute("mnemonic", //$NON-NLS-1$
-				PDETemplateMessages.HelloWorldCmdTemplate_sampleAction_mnemonic);
-		menu.add(menuCommand);
-		menuAddition.add(menu);
-		menusExtension.add(menuAddition);
-
-		IPluginElement toolbarAddition = factory.createElement(menusExtension);
-		toolbarAddition.setName("menuContribution"); //$NON-NLS-1$
-		toolbarAddition.setAttribute("locationURI", //$NON-NLS-1$
-				"toolbar:org.eclipse.ui.main.toolbar?after=additions"); //$NON-NLS-1$
-		IPluginElement toolbar = factory.createElement(toolbarAddition);
-		toolbar.setName("toolbar"); //$NON-NLS-1$
-		String toolbarId = plugin.getId() + ".toolbars.sampleToolbar"; //$NON-NLS-1$
-		toolbar.setAttribute("id", toolbarId); //$NON-NLS-1$
-		IPluginElement toolbarCommand = factory.createElement(toolbar);
-		toolbarCommand.setName("command"); //$NON-NLS-1$
-		toolbarCommand.setAttribute("id", plugin.getId() + ".toolbars.sampleCommand"); //$NON-NLS-1$ //$NON-NLS-2$
-		toolbarCommand.setAttribute("commandId", commandId); //$NON-NLS-1$
-		toolbarCommand.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		toolbarCommand.setAttribute("tooltip", //$NON-NLS-1$
-				PDETemplateMessages.HelloWorldCmdTemplate_sampleAction_tooltip);
-		toolbar.add(toolbarCommand);
-		toolbarAddition.add(toolbar);
-		menusExtension.add(toolbarAddition);
-
-		if (!commandsExtension.isInTheModel()) {
-			plugin.add(commandsExtension);
-		}
-		if (!handlersExtension.isInTheModel()) {
-			plugin.add(handlersExtension);
-		}
-		if (!bindingsExtension.isInTheModel()) {
-			plugin.add(bindingsExtension);
-		}
-		if (!menusExtension.isInTheModel()) {
-			plugin.add(menusExtension);
-		}
-	}
-
-	/*
-	 * (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 + ".handlers"; //$NON-NLS-1$
-		return "handlers"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java
deleted file mode 100644
index 65edf75..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class HelloWorldNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for HelloWorldNewWizard.
-	 */
-	public HelloWorldNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.HelloWorldNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloWorldTemplate()};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java
deleted file mode 100644
index 2026aba..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.internal.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-
-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, PDETemplateMessages.HelloWorldTemplate_packageName, (String) null, 0);
-		addOption(KEY_CLASS_NAME, PDETemplateMessages.HelloWorldTemplate_className, CLASS_NAME, 0);
-		addOption(KEY_MESSAGE, PDETemplateMessages.HelloWorldTemplate_messageText, PDETemplateMessages.HelloWorldTemplate_defaultMessage, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_HELLO_WORLD);
-		page.setTitle(PDETemplateMessages.HelloWorldTemplate_title);
-		page.setDescription(PDETemplateMessages.HelloWorldTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	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", PDETemplateMessages.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", PDETemplateMessages.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", PDETemplateMessages.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", PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java
deleted file mode 100644
index 7b72eb9..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class HelpNewWizard extends NewPluginTemplateWizard {
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.HelpNewWizard_wiz);
-	}
-
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelpTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java
deleted file mode 100644
index 2a4dc96..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java
+++ /dev/null

@@ -1,218 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.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.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-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(PDETemplateMessages.HelpTemplate_title);
-		page.setDescription(PDETemplateMessages.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, PDETemplateMessages.HelpTemplate_tocLabel, PDETemplateMessages.HelpTemplate_sampleText, 0);
-
-		primaryOption = (BooleanOption) addOption(KEY_IS_PRIMARY, PDETemplateMessages.HelpTemplate_isPrimary, false, 0);
-
-		genTestOption = (BooleanOption) addOption(KEY_GEN_TEST, PDETemplateMessages.HelpTemplate_generateTest, true, 0);
-
-		gettingStartedOption = (BooleanOption) addOption(KEY_GET_STARTED, PDETemplateMessages.HelpTemplate_gettingStarted, true, 0);
-
-		conceptsOption = (BooleanOption) addOption(KEY_CONCEPTS, PDETemplateMessages.HelpTemplate_concepts, true, 0);
-
-		tasksOption = (BooleanOption) addOption(KEY_TASKS, PDETemplateMessages.HelpTemplate_tasks, true, 0);
-
-		referenceOption = (BooleanOption) addOption(KEY_REFERENCE, PDETemplateMessages.HelpTemplate_reference, true, 0);
-
-		samplesOption = (BooleanOption) addOption(KEY_SAMPLES, PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java
deleted file mode 100644
index d331971..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java
+++ /dev/null

@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import java.util.StringTokenizer;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-public class ImportWizardTemplate extends PDETemplateSection {
-	public static final String WIZARD_CLASS_NAME = "wizardClassName"; //$NON-NLS-1$
-	public static final String WIZARD_CATEGORY_NAME = "wizardCategoryName"; //$NON-NLS-1$
-	public static final String WIZARD_PAGE_CLASS_NAME = "wizardPageClassName"; //$NON-NLS-1$
-	public static final String WIZARD_IMPORT_NAME = "wizardImportName"; //$NON-NLS-1$
-	public static final String WIZARD_FILE_FILTERS = "wizardFileFilters"; //$NON-NLS-1$
-
-	private WizardPage page;
-
-	/**
-	 * Constructor for ImportWizardTemplate.
-	 */
-	public ImportWizardTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		// Additional dependency required to provide WizardNewFileCreationPage
-		if (schemaVersion != null) {
-			IPluginReference[] dep = new IPluginReference[2];
-			dep[0] = new PluginReference("org.eclipse.ui.ide", null, 0); //$NON-NLS-1$
-			dep[1] = new PluginReference("org.eclipse.core.resources", null, 0); //$NON-NLS-1$
-			return dep;
-		}
-		return super.getDependencies(schemaVersion);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getDirectoryCandidates()
-	 */
-	public String getSectionId() {
-		// Identifier used for the folder name within the templates_3.X
-		// hierarchy  and as part of the lookup key for the template label
-		// variable.
-		return "importWizard"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	/**
-	 * Creates the options to be displayed on the template wizard.
-	 * Various string options, blank fields and a multiple choice 
-	 * option are used.
-	 */
-	private void createOptions() {
-		String[][] choices = fromCommaSeparated(PDETemplateMessages.ImportWizardTemplate_filterChoices);
-
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.ImportWizardTemplate_packageName, (String) null, 0);
-		addOption(WIZARD_CLASS_NAME, PDETemplateMessages.ImportWizardTemplate_wizardClass, PDETemplateMessages.ImportWizardTemplate_wizardClassName, 0);
-		addOption(WIZARD_PAGE_CLASS_NAME, PDETemplateMessages.ImportWizardTemplate_pageClass, PDETemplateMessages.ImportWizardTemplate_pageClassName, 0);
-
-		addBlankField(0);
-
-		addOption(WIZARD_CATEGORY_NAME, PDETemplateMessages.ImportWizardTemplate_importWizardCategory, PDETemplateMessages.ImportWizardTemplate_importWizardCategoryName, 0);
-		addOption(WIZARD_IMPORT_NAME, PDETemplateMessages.ImportWizardTemplate_wizardName, PDETemplateMessages.ImportWizardTemplate_wizardDefaultName, 0);
-
-		addBlankField(0);
-
-		addOption(WIZARD_FILE_FILTERS, PDETemplateMessages.ImportWizardTemplate_filters, choices, choices[0][0], 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
-	 */
-	public void addPages(Wizard wizard) {
-		int pageIndex = 0;
-
-		page = createPage(pageIndex, IHelpContextIds.TEMPLATE_EDITOR);
-		page.setTitle(PDETemplateMessages.ImportWizardTemplate_title);
-		page.setDescription(PDETemplateMessages.ImportWizardTemplate_desc);
-
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
-	 */
-	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));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
-	 */
-	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.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		// This method creates the extension point structure through the use
-		// of IPluginElement objects. The element attributes are set based on
-		// user input from the wizard page as well as values required for the 
-		// operation of the extension point.
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement categoryElement = factory.createElement(extension);
-		categoryElement.setName("category"); //$NON-NLS-1$
-		categoryElement.setAttribute("id", getStringOption(KEY_PACKAGE_NAME) + ".sampleCategory"); //$NON-NLS-1$ //$NON-NLS-2$
-		categoryElement.setAttribute("name", getStringOption(WIZARD_CATEGORY_NAME)); //$NON-NLS-1$
-
-		IPluginElement wizardElement = factory.createElement(extension);
-		wizardElement.setName("wizard"); //$NON-NLS-1$
-		wizardElement.setAttribute("id", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(WIZARD_CLASS_NAME)); //$NON-NLS-1$ //$NON-NLS-2$
-		wizardElement.setAttribute("name", getStringOption(WIZARD_IMPORT_NAME)); //$NON-NLS-1$
-		wizardElement.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(WIZARD_CLASS_NAME)); //$NON-NLS-1$ //$NON-NLS-2$
-		wizardElement.setAttribute("category", getStringOption(KEY_PACKAGE_NAME) + ".sampleCategory"); //$NON-NLS-1$ //$NON-NLS-2$
-		wizardElement.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement descriptionElement = factory.createElement(extension);
-		descriptionElement.setName("description"); //$NON-NLS-1$
-		descriptionElement.setText(PDETemplateMessages.ImportWizardTemplate_wizardDescription);
-
-		wizardElement.add(descriptionElement);
-		extension.add(categoryElement);
-		extension.add(wizardElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/"}; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
-	 */
-	protected String getFormattedPackageName(String id) {
-		// Package name addition to create a location for containing
-		// any classes required by the decorator. 
-		String packageName = super.getFormattedPackageName(id);
-		if (packageName.length() != 0)
-			return packageName + ".importWizards"; //$NON-NLS-1$
-		return "importWizards"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.importWizards"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns a 2-D String array based on a comma seperated
-	 * string of choices. 
-	 * 
-	 * @param iconLocations
-	 * 				comma seperated string of icon placement options
-	 * @return the 2-D array of choices
-	 * 				
-	 */
-	protected String[][] fromCommaSeparated(String iconLocations) {
-		StringTokenizer tokens = new StringTokenizer(iconLocations, ","); //$NON-NLS-1$
-		String[][] choices = new String[tokens.countTokens() / 2][2];
-		int x = 0, y = 0;
-		while (tokens.hasMoreTokens()) {
-			choices[x][y++] = tokens.nextToken();
-			choices[x++][y--] = tokens.nextToken();
-		}
-		return choices;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java
deleted file mode 100644
index 4f14d0a..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class MultiPageEditorNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for MultiPageEditorNewWizard.
-	 */
-	public MultiPageEditorNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.MultiPageEditorNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new MultiPageEditorTemplate(), new NewWizardTemplate()};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java
deleted file mode 100644
index 851f187..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-import org.eclipse.pde.ui.templates.TemplateOption;
-
-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[6];
-			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.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, PDETemplateMessages.MultiPageEditorTemplate_packageName, (String) null, 0);
-		addOption("editorClassName", //$NON-NLS-1$
-				PDETemplateMessages.MultiPageEditorTemplate_className, "MultiPageEditor", //$NON-NLS-1$
-				0);
-		addOption("contributorClassName", //$NON-NLS-1$
-				PDETemplateMessages.MultiPageEditorTemplate_contributor, "MultiPageEditorContributor", //$NON-NLS-1$
-				0);
-		addOption("editorName", //$NON-NLS-1$
-				PDETemplateMessages.MultiPageEditorTemplate_editorName, PDETemplateMessages.MultiPageEditorTemplate_defaultEditorName, 0);
-		addOption("extensions", //$NON-NLS-1$
-				PDETemplateMessages.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(PDETemplateMessages.MultiPageEditorTemplate_title);
-		page.setDescription(PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
deleted file mode 100644
index bd06aa6..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.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.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginModelFactory;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-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, PDETemplateMessages.NewWizardTemplate_packageName, (String) null, 0);
-		addOption("categoryId", PDETemplateMessages.NewWizardTemplate_categoryId, (String) null, 0); //$NON-NLS-1$
-		addOption("categoryName", PDETemplateMessages.NewWizardTemplate_categoryName, "Sample Wizards", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("wizardClassName", PDETemplateMessages.NewWizardTemplate_className, "SampleNewWizard", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("wizardPageClassName", PDETemplateMessages.NewWizardTemplate_pageClassName, "SampleNewWizardPage", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("wizardName", PDETemplateMessages.NewWizardTemplate_wizardName, PDETemplateMessages.NewWizardTemplate_defaultName, 0); //$NON-NLS-1$
-		addOption("extension", PDETemplateMessages.NewWizardTemplate_extension, "mpe", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("initialFileName", PDETemplateMessages.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(PDETemplateMessages.NewWizardTemplate_title);
-		page.setDescription(PDETemplateMessages.NewWizardTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	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.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java
deleted file mode 100644
index 8774edd..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-public class PerspectiveTemplate extends PDETemplateSection {
-	public static final String PERSPECTIVE_CLASS_NAME = "perspectiveClassName"; //$NON-NLS-1$
-	public static final String PERSPECTIVE_NAME = "perspectiveCategoryName"; //$NON-NLS-1$
-
-	public static final String BLN_PERSPECTIVE_SHORTS = "perspectiveShortcuts"; //$NON-NLS-1$
-	public static final String BLN_NEW_WIZARD_SHORTS = "newWizardShortcuts"; //$NON-NLS-1$
-	public static final String BLN_SHOW_VIEW_SHORTS = "showViewShortcuts"; //$NON-NLS-1$
-	public static final String BLN_ACTION_SETS = "actionSets"; //$NON-NLS-1$
-
-	private WizardPage page;
-
-	/**
-	 * Constructor for PerspectiveTemplate.
-	 */
-	public PerspectiveTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		// Additional dependencies required
-		if (schemaVersion != null) {
-			IPluginReference[] dep = new IPluginReference[2];
-			dep[0] = new PluginReference("org.eclipse.ui.console", null, 0); //$NON-NLS-1$
-			dep[1] = new PluginReference("org.eclipse.jdt.ui", null, 0); //$NON-NLS-1$
-			return dep;
-		}
-		return super.getDependencies(schemaVersion);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getDirectoryCandidates()
-	 */
-	public String getSectionId() {
-		return "perspective"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	/**
-	 * Creates the options to be displayed on the template wizard.
-	 * Various string options, blank fields and a multiple choice 
-	 * option are used.
-	 */
-	private void createOptions() {
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.PerspectiveTemplate_packageName, (String) null, 0);
-		addOption(PERSPECTIVE_CLASS_NAME, PDETemplateMessages.PerspectiveTemplate_perspectiveClass, PDETemplateMessages.PerspectiveTemplate_perspectiveClassName, 0);
-		addOption(PERSPECTIVE_NAME, PDETemplateMessages.PerspectiveTemplate_perspective, PDETemplateMessages.PerspectiveTemplate_perspectiveName, 0);
-
-		addBlankField(0);
-
-		addOption(BLN_PERSPECTIVE_SHORTS, PDETemplateMessages.PerspectiveTemplate_perspectiveShortcuts, true, 0);
-		addOption(BLN_SHOW_VIEW_SHORTS, PDETemplateMessages.PerspectiveTemplate_showViewShortcuts, true, 0);
-		addOption(BLN_NEW_WIZARD_SHORTS, PDETemplateMessages.PerspectiveTemplate_newWizardShortcuts, true, 0);
-		addOption(BLN_ACTION_SETS, PDETemplateMessages.PerspectiveTemplate_actionSets, true, 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
-	 */
-	public void addPages(Wizard wizard) {
-		int pageIndex = 0;
-
-		page = createPage(pageIndex, IHelpContextIds.TEMPLATE_EDITOR);
-		page.setTitle(PDETemplateMessages.PerspectiveTemplate_title);
-		page.setDescription(PDETemplateMessages.PerspectiveTemplate_desc);
-
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
-	 */
-	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));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
-	 */
-	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.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		// This method creates the extension point structure through the use
-		// of IPluginElement objects. The element attributes are set based on
-		// user input from the wizard page as well as values required for the 
-		// operation of the extension point.
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement perspectiveElement = factory.createElement(extension);
-		perspectiveElement.setName("perspective"); //$NON-NLS-1$
-		perspectiveElement.setAttribute("id", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(PERSPECTIVE_CLASS_NAME)); //$NON-NLS-1$ //$NON-NLS-2$
-		perspectiveElement.setAttribute("name", getStringOption(PERSPECTIVE_NAME)); //$NON-NLS-1$
-		perspectiveElement.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(PERSPECTIVE_CLASS_NAME)); //$NON-NLS-1$ //$NON-NLS-2$
-		perspectiveElement.setAttribute("icon", "icons/releng_gears.gif"); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
-
-		extension.add(perspectiveElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/"}; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
-	 */
-	protected String getFormattedPackageName(String id) {
-		// Package name addition to create a location for containing
-		// any classes required by the decorator. 
-		String packageName = super.getFormattedPackageName(id);
-		if (packageName.length() != 0)
-			return packageName + ".perspectives"; //$NON-NLS-1$
-		return "perspectives"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.perspectives"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java
deleted file mode 100644
index ca53208..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class PopupMenuNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for PerspectiveExtensionsNewWizard.
-	 */
-	public PopupMenuNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.PopupMenuNewWizard_wtitle);
-	}
-
-	/**
-	 * @see NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new PopupMenuTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java
deleted file mode 100644
index 5f81027..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.AbstractTemplateSection;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-public class PopupMenuTemplate extends PDETemplateSection {
-
-	public static final String KEY_TARGET_OBJECT = "objectClass"; //$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(PDETemplateMessages.PopupMenuTemplate_title);
-		page.setDescription(PDETemplateMessages.PopupMenuTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(KEY_TARGET_OBJECT, PDETemplateMessages.PopupMenuTemplate_targetClass, "org.eclipse.core.resources.IFile", //$NON-NLS-1$
-				0);
-		addOption(KEY_SUBMENU_LABEL, PDETemplateMessages.PopupMenuTemplate_submenuName, PDETemplateMessages.PopupMenuTemplate_defaultSubmenuName, 0);
-		addOption(KEY_ACTION_LABEL, PDETemplateMessages.PopupMenuTemplate_actionLabel, PDETemplateMessages.PopupMenuTemplate_defaultActionName, 0);
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.PopupMenuTemplate_packageName, (String) null, 0);
-		addOption(KEY_ACTION_CLASS, PDETemplateMessages.PopupMenuTemplate_actionClass, PDETemplateMessages.PopupMenuTemplate_newAction, 0);
-		addOption(KEY_SELECTION, PDETemplateMessages.PopupMenuTemplate_enabledFor, new String[][] { {"singleSelection", PDETemplateMessages.PopupMenuTemplate_singleSelection}, //$NON-NLS-1$
-				{"multipleSelection", PDETemplateMessages.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 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("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$
-	}
-
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		IPluginReference[] result = new IPluginReference[2];
-		result[0] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
-		result[1] = new PluginReference("org.eclipse.core.resources", null, 0); //$NON-NLS-1$
-		return result;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java
deleted file mode 100644
index 047f749..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-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$
-
-	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, PDETemplateMessages.PreferencePageTemplate_packageName, (String) null, 0);
-		addOption(KEY_PAGE_CLASS_NAME, PDETemplateMessages.PreferencePageTemplate_className, "SamplePreferencePage", //$NON-NLS-1$
-				0);
-		addOption(KEY_PAGE_NAME, PDETemplateMessages.PreferencePageTemplate_pageName, PDETemplateMessages.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));
-	}
-
-	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));
-	}
-
-	protected String getTemplateDirectory() {
-		String schemaVersion = model.getPluginBase().getSchemaVersion();
-		return "templates_" + schemaVersion == null ? "3.0" : schemaVersion; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	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(PDETemplateMessages.PreferencePageTemplate_title);
-		page.setDescription(PDETemplateMessages.PreferencePageTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	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);
-
-		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.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java
deleted file mode 100644
index deeae76..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class PropertyPageNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for PropertyPageNewWizard.
-	 */
-	public PropertyPageNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.PropertyPageNewWizard_wtitle);
-	}
-
-	/**
-	 * @see NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new PropertyPageTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
deleted file mode 100644
index dcf1403..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 234376
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.*;
-import org.eclipse.pde.internal.ui.templates.*;
-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(PDETemplateMessages.PropertyPageTemplate_title);
-		page.setDescription(PDETemplateMessages.PropertyPageTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.PropertyPageTemplate_packageName, (String) null, 0);
-		addOption(KEY_CLASSNAME, PDETemplateMessages.PropertyPageTemplate_pageClass, "SamplePropertyPage", //$NON-NLS-1$
-				0);
-		addOption(KEY_PAGE_NAME, PDETemplateMessages.PropertyPageTemplate_pageName, PDETemplateMessages.PropertyPageTemplate_defaultPageName, 0);
-		addOption(KEY_TARGET_CLASS, PDETemplateMessages.PropertyPageTemplate_targetClass, "org.eclipse.core.resources.IFile", //$NON-NLS-1$
-				0);
-		addOption(KEY_NAME_FILTER, PDETemplateMessages.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 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$
-		if (getTargetVersion() < 3.3) {
-			pageElement.setAttribute("objectClass", getStringOption(KEY_TARGET_CLASS)); //$NON-NLS-1$
-		} else {
-			IPluginElement enabledWhen = factory.createElement(pageElement);
-			pageElement.add(enabledWhen);
-			enabledWhen.setName("enabledWhen"); //$NON-NLS-1$
-			IPluginElement instanceOf = factory.createElement(enabledWhen);
-			enabledWhen.add(instanceOf);
-			instanceOf.setName("instanceof"); //$NON-NLS-1$
-			instanceOf.setAttribute("value", 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.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java
deleted file mode 100644
index ee6f140..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java
+++ /dev/null

@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.internal.ui.templates.*;
-import org.eclipse.pde.internal.ui.wizards.product.ISplashHandlerConstants;
-import org.eclipse.pde.internal.ui.wizards.product.UpdateSplashHandlerAction;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-
-/**
- * SplashHandlersTemplate
- *
- */
-public class SplashHandlersTemplate extends PDETemplateSection {
-
-	private final static int F_PAGE_INDEX = 0;
-
-	private final static String F_DEFAULT_PRODUCT = "org.eclipse.sdk.ide"; //$NON-NLS-1$
-
-	private final static String F_FIELD_TEMPLATE = "fieldTemplate"; //$NON-NLS-1$
-
-	private final static String F_FIELD_PRODUCTS = "fieldProducts"; //$NON-NLS-1$
-
-	private final static String F_FIELD_CLASS = "fieldClass"; //$NON-NLS-1$
-
-	private final static String F_FIELD_SPLASH = "fieldSplash"; //$NON-NLS-1$
-
-	private final static String F_SPLASH_SCREEN_FILE = "splash.bmp"; //$NON-NLS-1$
-
-	private WizardPage fPage;
-
-	private TemplateOption fFieldTemplate;
-
-	private ComboChoiceOption fFieldProducts;
-
-	private TemplateOption fFieldPackage;
-
-	private StringOption fFieldClass;
-
-	private TemplateOption fFieldSplash;
-
-	/**
-	 * 
-	 */
-	public SplashHandlersTemplate() {
-		initialize();
-	}
-
-	/**
-	 * 
-	 */
-	private void initialize() {
-		// Default field values
-		fFieldTemplate = null;
-		fFieldProducts = null;
-		fFieldPackage = null;
-		fFieldClass = null;
-		fFieldSplash = null;
-		// One wizard page
-		setPageCount(1);
-		// GUI
-		createUI();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
-	 */
-	public void addPages(Wizard wizard) {
-		// Create the page
-		fPage = createPage(0, IHelpContextIds.TEMPLATE_SPLASH_HANDLERS);
-		fPage.setTitle(PDETemplateMessages.SplashHandlersTemplate_titleSplashHandlerOptions);
-		fPage.setDescription(PDETemplateMessages.SplashHandlersTemplate_descSplashHandlerOptions);
-		// Add the page
-		wizard.addPage(fPage);
-		// Mark as added
-		markPagesAdded();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
-	 */
-	protected String getFormattedPackageName(String id) {
-		// Package name addition to create a location for containing
-		// any classes required by the splash handlers. 
-		String packageName = super.getFormattedPackageName(id);
-		// Unqualifed
-		if (packageName.length() == 0) {
-			return ISplashHandlerConstants.F_UNQUALIFIED_EXTENSION_ID;
-		}
-		// Qualified
-		return packageName + '.' + ISplashHandlerConstants.F_UNQUALIFIED_EXTENSION_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		// Note:  This does not even get called for non-project templates
-		// As a result, listed files are not added to the binary build 
-		// section
-		if (isSplashFieldSelected()) {
-			return new String[] {F_SPLASH_SCREEN_FILE};
-		}
-		// TODO: MP: SPLASH: Investigate if this is necessary, does not get called for non-project templates
-		return super.getNewFiles();
-	}
-
-	private boolean isSplashFieldSelected() {
-		if ((Boolean) fFieldSplash.getValue() == Boolean.TRUE) {
-			return true;
-		}
-		return false;
-	}
-
-	/* (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.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
-	 */
-	protected void initializeFields(IFieldData data) {
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
-	 */
-	public void initializeFields(IPluginModelBase model) {
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		// Update class name
-		if (source == fFieldTemplate) {
-			updateUIFieldClass();
-		}
-		super.validateOptions(source);
-	}
-
-	/**
-	 * 
-	 */
-	private void updateUIFieldClass() {
-		// Update the class name depending on the splash screen type
-		for (int i = 0; i < ISplashHandlerConstants.F_SPLASH_SCREEN_TYPE_CHOICES.length; i++) {
-			String choice = ISplashHandlerConstants.F_SPLASH_SCREEN_TYPE_CHOICES[i][0];
-			if (fFieldTemplate.getValue().equals(choice)) {
-				fFieldClass.setValue(ISplashHandlerConstants.F_SPLASH_SCREEN_CLASSES[i]);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void createUI() {
-		// Field:  template
-		createUIFieldTemplate();
-		// Field:  product ID
-		createUIFieldProductID();
-		// Field:  package
-		createUIFieldPackage();
-		// Field:  class
-		createUIFieldClass();
-		// Field:  splash
-		createUIFieldSplash();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIFieldSplash() {
-		fFieldSplash = addOption(F_FIELD_SPLASH, PDETemplateMessages.SplashHandlersTemplate_fieldAddSplash, false, F_PAGE_INDEX);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIFieldClass() {
-		fFieldClass = (StringOption) addOption(F_FIELD_CLASS, PDETemplateMessages.SplashHandlersTemplate_fieldClassName, ISplashHandlerConstants.F_SPLASH_SCREEN_CLASSES[0], F_PAGE_INDEX);
-		fFieldClass.setReadOnly(true);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIFieldPackage() {
-		fFieldPackage = addOption(KEY_PACKAGE_NAME, PDETemplateMessages.SplashHandlersTemplate_fieldJavaPackage, null, F_PAGE_INDEX);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIFieldTemplate() {
-		fFieldTemplate = addOption(F_FIELD_TEMPLATE, PDETemplateMessages.SplashHandlersTemplate_fieldSplashScreenType, ISplashHandlerConstants.F_SPLASH_SCREEN_TYPE_CHOICES, ISplashHandlerConstants.F_SPLASH_SCREEN_TYPE_CHOICES[0][0], F_PAGE_INDEX);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIFieldProductID() {
-
-		String[] products = TargetPlatform.getProducts();
-		String[][] choices = new String[products.length][2];
-		String initialChoice = null;
-		boolean foundInitialChoice = false;
-		// Populate choices with products
-		for (int i = 0; i < products.length; i++) {
-			// ID
-			choices[i][0] = products[i];
-			// Name
-			choices[i][1] = products[i];
-			// Determine whether default product is present
-			if ((foundInitialChoice == false) && (products[i].equals(F_DEFAULT_PRODUCT))) {
-				foundInitialChoice = true;
-			}
-		}
-		// Use default product as the initial product choice if found;
-		// otherwise, use the first item found
-		if (foundInitialChoice) {
-			initialChoice = F_DEFAULT_PRODUCT;
-		} else {
-			initialChoice = choices[0][0];
-		}
-		// Create the field
-		fFieldProducts = addComboChoiceOption(F_FIELD_PRODUCTS, PDETemplateMessages.SplashHandlersTemplate_fieldProductID, choices, initialChoice, F_PAGE_INDEX);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		// Ensure schema version was defined
-		if (schemaVersion == null) {
-			return super.getDependencies(schemaVersion);
-		}
-		// Create the dependencies for the splash handler extension template addition
-		IPluginReference[] dependencies = new IPluginReference[4];
-		dependencies[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-		dependencies[1] = new PluginReference("org.eclipse.swt", null, 0); //$NON-NLS-1$
-		dependencies[2] = new PluginReference("org.eclipse.jface", null, 0); //$NON-NLS-1$
-		dependencies[3] = new PluginReference("org.eclipse.ui.workbench", null, 0); //$NON-NLS-1$
-
-		return dependencies;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return ISplashHandlerConstants.F_UNQUALIFIED_EXTENSION_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		// Create the action to update the model with the associated 
-		// splash handler extensions, extension points, elements and attributes
-		UpdateSplashHandlerAction action = new UpdateSplashHandlerAction();
-		// Configure the acation
-		String id = createAttributeValueID();
-		action.setFieldID(id);
-		action.setFieldClass(createAttributeValueClass());
-		action.setFieldSplashID(id);
-		action.setFieldProductID((String) fFieldProducts.getValue());
-		action.setFieldTemplate((String) fFieldTemplate.getValue());
-		action.setFieldPluginID(model.getPluginBase().getId());
-		action.setModel(model);
-		action.setMonitor(monitor);
-		// Execute the action
-		action.run();
-		// If an exception was caught, release it
-		action.hasException();
-	}
-
-	private String createAttributeValueID() {
-		// Create the ID based on the splash screen type
-		return fFieldPackage.getValue() + "." + //$NON-NLS-1$
-				fFieldTemplate.getValue();
-	}
-
-	private String createAttributeValueClass() {
-		// Create the class based on the splash screen type
-		return fFieldPackage.getValue() + "." + //$NON-NLS-1$
-				fFieldClass.getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return ISplashHandlerConstants.F_SPLASH_HANDLERS_EXTENSION;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFile(java.io.File)
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-		// TODO: MP: SPLASH:  Sync this with org.eclipse.pde.internal.ui.util.TemplateFileGenerator
-		String javaSuffix = ".java"; //$NON-NLS-1$
-		String targetFile = fFieldClass.getValue() + javaSuffix;
-		String copyFile = sourceFile.toString();
-
-		if (copyFile.endsWith(javaSuffix) && (copyFile.endsWith(targetFile) == false)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#copyBrandingDirectory()
-	 */
-	protected boolean copyBrandingDirectory() {
-		return isSplashFieldSelected();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFolder(java.io.File)
-	 */
-	protected boolean isOkToCreateFolder(File sourceFolder) {
-		// TODO: MP: SPLASH:  Sync this with org.eclipse.pde.internal.ui.util.TemplateFileGenerator
-		boolean extensibleTemplateSelected = UpdateSplashHandlerAction.isExtensibleTemplateSelected((String) fFieldTemplate.getValue());
-		String sourceFolderString = sourceFolder.toString();
-
-		if ((extensibleTemplateSelected == false) && sourceFolderString.endsWith("icons")) { //$NON-NLS-1$
-			return false;
-		} else if ((extensibleTemplateSelected == false) && sourceFolderString.endsWith("schema")) { //$NON-NLS-1$
-			return false;
-		}
-
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getLabel()
-	 */
-	public String getLabel() {
-		return getPluginResourceString("wizard.name.splash.handler"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getDescription()
-	 */
-	public String getDescription() {
-		return getPluginResourceString("wizard.description.splash.handler"); //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
deleted file mode 100644
index 7cdecae..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.*;
-import org.eclipse.pde.internal.ui.templates.*;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.AbstractTemplateSection;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-/**
- * Creates a template for contributing to the Universal Welcome
- * intro. Requires Eclipse version 3.2.
- * 
- *  @since 3.2
- */
-
-public class UniversalWelcomeTemplate extends PDETemplateSection {
-	private static final String KEY_LINK_ID = "linkId"; //$NON-NLS-1$
-
-	private static final String KEY_EXTENSION_ID = "extensionId"; //$NON-NLS-1$
-
-	private static final String KEY_INTRO_DIR = "introDir"; //$NON-NLS-1$
-
-	private static final String KEY_PATH = "path"; //$NON-NLS-1$
-
-	private static final String KEY_LINK_URL = "linkUrl"; //$NON-NLS-1$
-
-	private String pluginId;
-
-	public UniversalWelcomeTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	private void createOptions() {
-		// options
-		addOption(KEY_INTRO_DIR, PDETemplateMessages.UniversalWelcomeTemplate_key_directoryName, "intro", 0); //$NON-NLS-1$
-		addOption(KEY_PATH, PDETemplateMessages.UniversalWelcomeTemplate_key_targetPage, new String[][] { {"overview/@", PDETemplateMessages.UniversalWelcomeTemplate_page_Overview}, {"tutorials/@", PDETemplateMessages.UniversalWelcomeTemplate_page_Tutorials}, //$NON-NLS-1$ //$NON-NLS-2$
-				{"firststeps/@", PDETemplateMessages.UniversalWelcomeTemplate_page_FirstSteps}, {"samples/@", PDETemplateMessages.UniversalWelcomeTemplate_page_Samples}, //$NON-NLS-1$ //$NON-NLS-2$
-				{"whatsnew/@", PDETemplateMessages.UniversalWelcomeTemplate_page_Whatsnew}, {"migrate/@", PDETemplateMessages.UniversalWelcomeTemplate_page_Migrate}, //$NON-NLS-1$ //$NON-NLS-2$
-				{"webresources/@", PDETemplateMessages.UniversalWelcomeTemplate_page_WebResources}}, "overview/@", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption(KEY_LINK_URL, PDETemplateMessages.UniversalWelcomeTemplate_linkUrl, "http://www.eclipse.org", 0); //$NON-NLS-1$
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_UNIVERSAL_WELCOME);
-		page.setTitle(PDETemplateMessages.IntroTemplate_title);
-		page.setDescription(PDETemplateMessages.IntroTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	public String getSectionId() {
-		return "universalWelcome"; //$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
-		pluginId = data.getId();
-	}
-
-	public void initializeFields(IPluginModelBase model) {
-		pluginId = model.getPluginBase().getId();
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-
-		IPluginExtension extension = createExtension("org.eclipse.ui.intro.configExtension", false); //$NON-NLS-1$
-
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("configExtension"); //$NON-NLS-1$
-		element.setAttribute("configId", //$NON-NLS-1$
-				"org.eclipse.ui.intro.universalConfig"); //$NON-NLS-1$
-		element.setAttribute("content", getStringOption(KEY_INTRO_DIR) //$NON-NLS-1$
-				+ "/sample.xml"); //$NON-NLS-1$
-		extension.add(element);
-
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	protected boolean isOkToCreateFolder(File sourceFolder) {
-		return true;
-	}
-
-	/**
-	 * @see AbstractTemplateSection#isOkToCreateFile(File)
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-		return true;
-	}
-
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.intro.configExtension"; //$NON-NLS-1$
-	}
-
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		ArrayList result = new ArrayList();
-
-		// We really need Eclipse 3.2 or higher but since Universal
-		// appears in 3.2 for the first time, just depending on
-		// its presence has the same effect.
-		result.add(new PluginReference("org.eclipse.ui.intro", null, 0)); //$NON-NLS-1$
-		result.add(new PluginReference("org.eclipse.ui.intro.universal", 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()]);
-	}
-
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	/*
-	 * We are going to compute some values even though we are
-	 * not exposing them as options.
-	 */
-	public String getStringOption(String name) {
-		if (name.equals(KEY_EXTENSION_ID)) {
-			return stripNonAlphanumeric(pluginId) + "-introExtension"; //$NON-NLS-1$
-		}
-		if (name.equals(KEY_LINK_ID)) {
-			return stripNonAlphanumeric(pluginId) + "-introLink"; //$NON-NLS-1$
-		}
-		return super.getStringOption(name);
-	}
-
-	/*
-	 * Strips any non alphanumeric characters from the string so as not to break the css
-	 */
-	private String stripNonAlphanumeric(String id) {
-		StringBuffer result = new StringBuffer();
-		for (int i = 0; i < id.length(); i++) {
-			char next = id.charAt(i);
-			if (Character.isLetterOrDigit(next)) {
-				result.append(next);
-			}
-		}
-		return result.toString();
-	}
-
-	public String[] getNewFiles() {
-		return new String[] {getStringOption(KEY_INTRO_DIR) + "/"}; //$NON-NLS-1$
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java
deleted file mode 100644
index 1014a0f..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class ViewNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for ViewNewWizard.
-	 */
-	public ViewNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.ViewNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new ViewTemplate()};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
deleted file mode 100644
index 553496c..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
+++ /dev/null

@@ -1,221 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2000, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.ide;
-
-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.*;
-import org.eclipse.pde.internal.ui.templates.*;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-
-public class ViewTemplate extends PDETemplateSection {
-	private BooleanOption addToPerspective;
-	private BooleanOption contextHelp;
-
-	/**
-	 * Constructor for HelloWorldTemplate.
-	 */
-	public ViewTemplate() {
-		setPageCount(1);
-		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, PDETemplateMessages.ViewTemplate_packageName, (String) null, 0);
-		addOption("className", PDETemplateMessages.ViewTemplate_className, "SampleView", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("viewName", PDETemplateMessages.ViewTemplate_name, PDETemplateMessages.ViewTemplate_defaultName, 0); //$NON-NLS-1$
-		addOption("viewCategoryId", PDETemplateMessages.ViewTemplate_categoryId, (String) null, 0); //$NON-NLS-1$
-		addOption("viewCategoryName", PDETemplateMessages.ViewTemplate_categoryName, PDETemplateMessages.ViewTemplate_defaultCategoryName, 0); //$NON-NLS-1$
-		addOption("viewType", PDETemplateMessages.ViewTemplate_select, //$NON-NLS-1$
-				new String[][] { {"tableViewer", PDETemplateMessages.ViewTemplate_table}, //$NON-NLS-1$
-						{"treeViewer", PDETemplateMessages.ViewTemplate_tree}}, //$NON-NLS-1$
-				"tableViewer", 0); //$NON-NLS-1$
-		addOption("addViewID", PDETemplateMessages.ViewTemplate_addViewID, true, 0); //$NON-NLS-1$
-		addToPerspective = (BooleanOption) addOption("addToPerspective", PDETemplateMessages.ViewTemplate_addToPerspective, true, 0); //$NON-NLS-1$
-		contextHelp = (BooleanOption) addOption("contextHelp", PDETemplateMessages.ViewTemplate_contextHelp, true, 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
-		initializeFields(data.getId());
-
-	}
-
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		initializeFields(model.getPluginBase().getId());
-	}
-
-	public void initializeFields(String id) {
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
-		initializeOption("viewCategoryId", id); //$NON-NLS-1$
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page0 = createPage(0, IHelpContextIds.TEMPLATE_VIEW);
-		page0.setTitle(PDETemplateMessages.ViewTemplate_title0);
-		page0.setDescription(PDETemplateMessages.ViewTemplate_desc0);
-		wizard.addPage(page0);
-
-		markPagesAdded();
-	}
-
-	/**
-	 * @see AbstractTemplateSection#isOkToCreateFile(File)
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-		boolean isOk = true;
-		String fileName = sourceFile.getName();
-		if (fileName.equals("contexts.xml")) { //$NON-NLS-1$
-			isOk = contextHelp.isSelected();
-		}
-		return isOk;
-	}
-
-	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.jdt.ui.JavaPerspective"); //$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);
-		}
-
-		if (contextHelp.isSelected()) {
-			IPluginExtension contextExtension = createExtension("org.eclipse.help.contexts", true); //$NON-NLS-1$
-
-			IPluginElement contextsElement = factory.createElement(contextExtension);
-			contextsElement.setName("contexts"); //$NON-NLS-1$
-			contextsElement.setAttribute("file", "contexts.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-			contextExtension.add(contextsElement);
-			if (!contextExtension.isInTheModel())
-				plugin.add(contextExtension);
-		}
-	}
-
-	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() {
-		if (contextHelp.isSelected())
-			return new String[] {"icons/", "contexts.xml"}; //$NON-NLS-1$ //$NON-NLS-2$
-		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$
-	}
-
-	public Object getValue(String name) {
-		if (name.equals("useEnablement")) //$NON-NLS-1$
-			return new Boolean(getTargetVersion() >= 3.3);
-		return super.getValue(name);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java
deleted file mode 100644
index 0e665e2..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-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 {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
-	 */
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDETemplateMessages.HelloOSGiNewWizard_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloOSGiTemplate()};
-	}
-
-	public String[] getImportPackages() {
-		return new String[] {"org.osgi.framework;version=\"1.3.0\""}; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java
deleted file mode 100644
index e58d9b8..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class HelloOSGiServiceNewWizard 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(PDETemplateMessages.HelloOSGiServiceNewWizard_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloOSGiServiceTemplate()};
-	}
-
-	public String[] getImportPackages() {
-		return new String[] {"org.osgi.framework;version=\"1.3.0\"", "org.osgi.util.tracker;version=\"1.3.1\""}; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java
deleted file mode 100644
index bc9e9dc..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-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.templates.*;
-
-public class HelloOSGiServiceTemplate extends PDETemplateSection {
-
-	public static final String LANGUAGE = "language"; //$NON-NLS-1$
-	public static final String WORD1 = "word1"; //$NON-NLS-1$
-	public static final String WORD2 = "word2"; //$NON-NLS-1$
-	public static final String WORD3 = "word3"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$NON-NLS-1$
-
-	public HelloOSGiServiceTemplate() {
-		setPageCount(1);
-		addOption(LANGUAGE, PDETemplateMessages.HelloOSGiServiceTemplate_greeting, PDETemplateMessages.HelloOSGiServiceTemplate_howdy, 0);
-		addOption(WORD1, PDETemplateMessages.HelloOSGiServiceTemplate_word1, "osgi", 0); //$NON-NLS-1$
-		addOption(WORD2, PDETemplateMessages.HelloOSGiServiceTemplate_word2, "eclipse", 0); //$NON-NLS-1$
-		addOption(WORD3, PDETemplateMessages.HelloOSGiServiceTemplate_word3, "equinox", 0); //$NON-NLS-1$
-
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDETemplateMessages.HelloOSGiServiceTemplate_pageTitle);
-		page.setDescription(PDETemplateMessages.HelloOSGiServiceTemplate_pageDescription);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "helloOSGiService"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) { // do nothing
-
-	}
-
-	/* (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.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java
deleted file mode 100644
index f96bcbd..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-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.templates.*;
-
-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$
-
-	public HelloOSGiTemplate() {
-		setPageCount(1);
-		addOption(KEY_START_MESSAGE, PDETemplateMessages.HelloOSGiTemplate_startMessage, PDETemplateMessages.HelloOSGiTemplate_hello, 0);
-		addOption(KEY_STOP_MESSAGE, PDETemplateMessages.HelloOSGiTemplate_stopMessage, PDETemplateMessages.HelloOSGiTemplate_goodbye, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDETemplateMessages.HelloOSGiTemplate_pageTitle);
-		page.setDescription(PDETemplateMessages.HelloOSGiTemplate_pageDescription);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/*
-	 * (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.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) { // do nothing
-
-	}
-
-	/* (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.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java
deleted file mode 100644
index 300a9ed..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 244558
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.*;
-import org.eclipse.pde.ui.IFieldData;
-
-public class HelloServiceComponentTemplate extends PDETemplateSection {
-
-	public static final String COMMAND = "command"; //$NON-NLS-1$
-	public static final String WORD1 = "word1"; //$NON-NLS-1$
-	public static final String WORD2 = "word2"; //$NON-NLS-1$
-	public static final String WORD3 = "word3"; //$NON-NLS-1$
-	private String packageName = null;
-
-	public HelloServiceComponentTemplate() {
-		setPageCount(1);
-		addOption(COMMAND, PDETemplateMessages.HelloServiceComponentTemplate_commandTitle, PDETemplateMessages.HelloServiceComponentTemplate_command, 0);
-		addOption(WORD1, PDETemplateMessages.HelloOSGiServiceTemplate_word1, "osgi", 0); //$NON-NLS-1$
-		addOption(WORD2, PDETemplateMessages.HelloOSGiServiceTemplate_word2, "eclipse", 0); //$NON-NLS-1$
-		addOption(WORD3, PDETemplateMessages.HelloOSGiServiceTemplate_word3, "equinox", 0); //$NON-NLS-1$
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDETemplateMessages.DSTemplate_pageTitle);
-		page.setDescription(PDETemplateMessages.DSTemplate_pageDescription);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "helloOSGiServiceComponent"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) { // do nothing
-		setManifestHeader("Service-Component", "OSGI-INF/*.xml"); //$NON-NLS-1$ //$NON-NLS-2$]
-	}
-
-	/* (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];
-	}
-
-	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);
-		this.packageName = getFormattedPackageName(data.getId());
-	}
-
-	public void initializeFields(IPluginModelBase model) {
-		String id = model.getPluginBase().getId();
-		String packageName = getFormattedPackageName(id);
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-		this.packageName = getFormattedPackageName(id);
-	}
-
-	public String getStringOption(String name) {
-		if (name.equals(KEY_PACKAGE_NAME)) {
-			return packageName;
-		}
-		return super.getStringOption(name);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java
deleted file mode 100644
index 00f11a0..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Code 9 Corporation - initial API and implementation
- *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 244558
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class HelloServiceComponentTemplateWizard 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(PDETemplateMessages.DSTemplateWizard_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloServiceComponentTemplate()};
-	}
-
-	public String[] getImportPackages() {
-		return new String[] {"org.osgi.framework;version=\"1.3.0\"", "org.osgi.util.tracker;version=\"1.3.1\"", "org.eclipse.osgi.framework.console;version=\"1.0.0\""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		return new IPluginReference[0];
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java
deleted file mode 100644
index da0ea59..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.*;
-import org.eclipse.pde.ui.IFieldData;
-
-public class OSGiEventAdminTemplate extends PDETemplateSection {
-
-	public static final String EVENT_TOPIC = "eventTopic"; //$NON-NLS-1$
-	private String packageName = null;
-
-	public OSGiEventAdminTemplate() {
-		setPageCount(1);
-		addOption(EVENT_TOPIC, PDETemplateMessages.OSGiEventAdminTemplate_eventTopicTitle, "org/osgi/framework/BundleEvent/STARTED", 0); //$NON-NLS-1$
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDETemplateMessages.OSGiEventAdminTemplate_pageTitle);
-		page.setDescription(PDETemplateMessages.OSGiEventAdminTemplate_pageDescription);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "OSGiEventAdmin"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) { // do nothing
-		setManifestHeader("Service-Component", "OSGI-INF/*.xml"); //$NON-NLS-1$ //$NON-NLS-2$]
-	}
-
-	/* (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];
-	}
-
-	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);
-		this.packageName = getFormattedPackageName(data.getId());
-	}
-
-	public void initializeFields(IPluginModelBase model) {
-		String id = model.getPluginBase().getId();
-		String packageName = getFormattedPackageName(id);
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-		this.packageName = getFormattedPackageName(id);
-	}
-
-	public String getStringOption(String name) {
-		if (name.equals(KEY_PACKAGE_NAME)) {
-			return packageName;
-		}
-		return super.getStringOption(name);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java
deleted file mode 100644
index 10635c7..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     EclipseSource Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class OSGiEventAdminTemplateWizard 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(PDETemplateMessages.OSGiEventAdminTemplateWizard_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new OSGiEventAdminTemplate()};
-	}
-
-	public String[] getImportPackages() {
-		return new String[] {"org.osgi.framework;version=\"1.3.0\"", "org.osgi.service.event;version=\"1.2.0\""}; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		return new IPluginReference[0];
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java
deleted file mode 100644
index 89cc993..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class OSGiPreferencesServiceNewWizard 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(PDETemplateMessages.OSGiPreferencesServiceNewWizard_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new OSGiPreferencesServiceTemplate()};
-	}
-
-	public String[] getImportPackages() {
-		return new String[] {"org.osgi.service.prefs;version=\"1.1\"", //$NON-NLS-1$
-				"org.osgi.util.tracker;version=\"1.3.1\""}; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java
deleted file mode 100644
index 6572b61..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-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.templates.*;
-
-public class OSGiPreferencesServiceTemplate extends PDETemplateSection {
-
-	public static final String COLOR = "color"; //$NON-NLS-1$
-
-	public OSGiPreferencesServiceTemplate() {
-		setPageCount(1);
-		addOption(COLOR, PDETemplateMessages.OSGiPreferencesServiceTemplate_label, PDETemplateMessages.OSGiPreferencesServiceTemplate_value, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDETemplateMessages.OSGiPreferencesServiceTemplate_pageTitle);
-		page.setDescription(PDETemplateMessages.OSGiPreferencesServiceTemplate_pageDescription);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "OSGiPreferencesService"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) {
-		// do nothing
-	}
-
-	/* (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.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java
deleted file mode 100644
index f2315c0..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class OSGiSimpleLogServiceNewWizard 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(PDETemplateMessages.OSGiSimpleLogServiceNewWizard_title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new OSGiSimpleLogServiceTemplate()};
-	}
-
-	public String[] getImportPackages() {
-		return new String[] {"org.osgi.framework;version=\"1.3.0\"", //$NON-NLS-1$
-				"org.osgi.util.tracker;version=\"1.3.1\"", //$NON-NLS-1$
-				"org.osgi.service.log; version=\"1.3\""}; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java
deleted file mode 100644
index 3c6e810..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2006, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.osgi;
-
-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.templates.*;
-
-public class OSGiSimpleLogServiceTemplate extends PDETemplateSection {
-
-	public static final String START_LOG_MESSAGE = "startLogMessage"; //$NON-NLS-1$
-	public static final String STOP_LOG_MESSAGE = "stopLogMessage"; //$NON-NLS-1$
-
-	public OSGiSimpleLogServiceTemplate() {
-		setPageCount(1);
-		addOption(START_LOG_MESSAGE, PDETemplateMessages.OSGiSimpleLogServiceTemplate_startLogMessage, PDETemplateMessages.OSGiSimpleLogServiceTemplate_logMessage, 0);
-		addOption(STOP_LOG_MESSAGE, PDETemplateMessages.OSGiSimpleLogServiceTemplate_stopLogMessage, PDETemplateMessages.OSGiSimpleLogServiceTemplate_logMessage, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDETemplateMessages.OSGiSimpleLogServiceTemplate_pageTitle);
-		page.setDescription(PDETemplateMessages.OSGiSimpleLogServiceTemplate_pageDescription);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "OSGiSimpleLogService"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) {
-		// do nothing
-	}
-
-	/* (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.templates/src/org/eclipse/pde/internal/ui/templates/pderesources.properties b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/pderesources.properties
deleted file mode 100644
index b358b0e..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/pderesources.properties
+++ /dev/null

@@ -1,293 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-### Supplied templates
-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 = F&ile 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
-HelloOSGiTemplate_hello=Hello World\!\!
-HelloOSGiTemplate_goodbye=Goodbye World\!\!
-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_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_productBranding=A&dd branding
-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
-
-HelloOSGiServiceTemplate_greeting=&Language:
-HelloOSGiServiceTemplate_word1=Word 1: 
-HelloOSGiServiceTemplate_word2=Word 2: 
-HelloOSGiServiceTemplate_word3=Word 3: 
-HelloOSGiServiceTemplate_howdy=en_US
-HelloOSGiServiceTemplate_pageDescription=This template creates a OSGi service that acts as a dictionary.
-HelloOSGiServiceTemplate_pageTitle=Dictionary OSGi Service
-HelloOSGiServiceNewWizard_title=Dictionary OSGi Service Wizard
-
-DSTemplate_pageDescription=This template registers an OSGi service using declarative services
-DSTemplate_pageTitle=Declarative OSGi Service
-DSTemplateWizard_title=Declarative OSGi Service Wizard
-
-IntroNewWizard_wtitle = New RCP Project with an intro
-IntroTemplate_title = Sample Intro
-IntroTemplate_desc = This template creates a standalone RCP application with an intro.
-IntroTemplate_generate = Generate:
-IntroTemplate_generateStaticContent = static content
-IntroTemplate_generateDynamicContent = dynamic content
-IntroTemplate_productName = Product Name:
-
-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_appClass=App&lication class:
-ViewRCPTemplate_packageName = &Java package name:
-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:
-
-PopupMenuNewWizard_wtitle = New plug-in project with popup menus
-PopupMenuTemplate_title = Sample Popup Menu
-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_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:
-PopupMenuTemplate_singleSelection = S&ingle selection
-PopupMenuTemplate_multipleSelection = &Multiple selection
-PopupMenuTemplate_enabledFor =	Action is enabled for:
-
-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
-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:
-
-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_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_contextHelp=Add conte&xt help to the view
-ViewTemplate_addToPerspective = A&dd the view to the java perspective
-ViewTemplate_addViewID = Add a static attribute containing the view &ID
-
-HelpTemplate_title = Sample Help Table of Contents
-HelpTemplate_desc = Create a standalone or integrated table of contents.
-HelpNewWizard_wiz=New plug-in project with sample help content
-HelpTemplate_tocLabel = &Label for table of contents:
-HelpTemplate_isPrimary = Pri&mary
-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
-HelpTemplate_sampleText=Sample Table of Contents
-
-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
-
-DecoratorTemplate_title = Decorator Options
-DecoratorTemplate_desc = Choose the options to control which decorator should be created and where it should be displayed.
-DecoratorTemplate_packageName = &Java Package:
-DecoratorTemplate_decoratorClass = Decorator &Class Name:
-DecoratorTemplate_placement = Decorator Icon &Placement:
-DecoratorTemplate_decorateProject = &Decorate Project Folders
-DecoratorTemplate_decorateReadOnly = Only Decorate '&Read-only' files
-DecoratorTemplate_resourceLabel = Resource Decorator
-DecoratorTemplate_readOnlyLabel = Read-only Decorator
-DecoratorTemplate_placementChoices = BOTTOM_RIGHT,Bottom Right,BOTTOM_LEFT,Bottom Left,TOP_RIGHT,Top Right,TOP_LEFT,Top Left,UNDERLAY,Underlay, ,Blank
-
-ImportWizardTemplate_title = Import Wizard Options
-ImportWizardTemplate_desc = Choose the options for the file import wizard.
-ImportWizardTemplate_packageName = &Java Package:
-ImportWizardTemplate_wizardClass = Wizard &Class Name:
-ImportWizardTemplate_wizardClassName = ImportWizard
-ImportWizardTemplate_importWizardCategory = Wizard Category Name:
-ImportWizardTemplate_importWizardCategoryName = Sample File Import
-ImportWizardTemplate_pageClass = Wizard Page Class Name:
-ImportWizardTemplate_pageClassName = ImportWizardPage
-ImportWizardTemplate_wizardName = Wizard Name:
-ImportWizardTemplate_wizardDefaultName = Import File
-ImportWizardTemplate_filters = Select File Type Filter:
-ImportWizardTemplate_filterChoices = All,Show All File Types (*.*),Images,Show Image File Types (*.jpg;*.gif;*.bmp),Docs,Show Document File Types (*.doc;*.txt;*.pdf),Archives,Show Archive File Types (*.zip;*.tar;*.jar)
-ImportWizardTemplate_wizardDescription = Import a file from the local file system into the workspace.
- 
-
-MailTemplate_title=RCP Mail Template
-MailNewWizard_title=New plug-in project with an RCP mail template
-MailTemplate_desc=This template generates a standalone RCP application, complete with views, menu and toolbar actions, keybindings and a product definition
-
-MailTemplate_productName=&Product name:
-MailTemplate_appClass=&Application class:
-MailTemplate_packageName=Pa&ckage name:
-
-UniversalWelcomeTemplate_key_directoryName=&Directory Name:
-UniversalWelcomeTemplate_key_targetPage=&Target Page:
-UniversalWelcomeTemplate_linkUrl=&Link URL:
-UniversalWelcomeTemplate_page_Overview=Overview
-UniversalWelcomeTemplate_page_Tutorials=Tutorials
-UniversalWelcomeTemplate_page_FirstSteps=First Steps
-UniversalWelcomeTemplate_page_Samples=Samples
-UniversalWelcomeTemplate_page_Whatsnew=What's New
-UniversalWelcomeTemplate_page_Migrate=Migrate
-UniversalWelcomeTemplate_page_WebResources=Web Resources
-
-#Perspective Template
-PerspectiveTemplate_title = Perspective Options
-PerspectiveTemplate_desc = Choose the options for the release engineering perspective.
-PerspectiveTemplate_packageName = &Java Package:
-PerspectiveTemplate_perspectiveClass = Perspective &Class Name:
-PerspectiveTemplate_perspectiveClassName = RelEngPerspective
-PerspectiveTemplate_perspective = &Perspective Name:
-PerspectiveTemplate_perspectiveName = Release Engineering
-PerspectiveTemplate_perspectiveShortcuts = Add &Related Perspective Shortcuts
-PerspectiveTemplate_showViewShortcuts = Add Show View &Shortcuts
-PerspectiveTemplate_newWizardShortcuts = Add New &Wizard Shortcuts
-PerspectiveTemplate_actionSets = Add &Menu and Toolbar Contributions (Action Sets) 
-
-#Preferences Service Example
-OSGiPreferencesServiceNewWizard_title = OSGi Preferences Service Example Wizard
-OSGiPreferencesServiceTemplate_label = Fa&vourite color:
-OSGiPreferencesServiceTemplate_pageTitle = OSGi Preferences Service Example
-OSGiPreferencesServiceTemplate_pageDescription = Store your favourite color in the OSGi Preferences service.
-OSGiPreferencesServiceTemplate_value = lavender
-
-#Log Service Example
-OSGiSimpleLogServiceTemplate_startLogMessage=&Start Log Message:
-OSGiSimpleLogServiceTemplate_stopLogMessage=S&top Log Message:
-OSGiSimpleLogServiceTemplate_logMessage=Yee ha, I'm logging!
-OSGiSimpleLogServiceTemplate_pageDescription=This template creates and registers a simple OSGi service that logs some messages.
-OSGiSimpleLogServiceTemplate_pageTitle=OSGi Simple LogService Example
-OSGiSimpleLogServiceNewWizard_title=OSGi Simple LogService Example Wizard
-SplashHandlersTemplate_titleSplashHandlerOptions=Splash Handler Options
-SplashHandlersTemplate_descSplashHandlerOptions=This template will create a splash handler that contributes custom behavior to the splash screen.
-SplashHandlersTemplate_fieldAddSplash=&Add a default splash screen to this plug-in
-SplashHandlersTemplate_fieldClassName=&Class Name:
-SplashHandlersTemplate_fieldJavaPackage=Java &Package:
-SplashHandlersTemplate_fieldSplashScreenType=&Splash Screen Type:
-SplashHandlersTemplate_fieldProductID=Product &ID:
-
-HelloWorldCmdNewWizard_wtitle = New Hello World Command plug-in project
-HelloWorldCmdTemplate_title = Sample Command Contribution
-HelloWorldCmdTemplate_desc= This template will generate a sample command contribution\
- with a menu, a menu item and a tool bar button.
-HelloWorldCmdTemplate_packageName = &Java Package Name:
-HelloWorldCmdTemplate_className = &Handler Class Name:
-HelloWorldCmdTemplate_messageText = &Message Box Text:
-HelloWorldCmdTemplate_defaultMessage = Hello, Eclipse world
-HelloWorldCmdTemplate_sampleCategory = Sample Category
-HelloWorldCmdTemplate_sampleMenu_name = Sample Menu
-HelloWorldCmdTemplate_sampleMenu_mnemonic = M
-HelloWorldCmdTemplate_sampleAction_name = Sample Command
-HelloWorldCmdTemplate_sampleAction_mnemonic = S
-HelloWorldCmdTemplate_sampleAction_tooltip = Say hello world
-
-# Common Navigator Template
-CommonNavigatorTemplate_viewId = View Id:
-CommonNavigatorTemplate_viewName = View Name:
-CommonNavigatorTemplate_addToPerspective = Add to Resource Perspective
-CommonNavigatorTemplate_defaultViewName=My Common Navigator
-CommonNavigatorTemplate_pagedescription=Choose the options for the Common Navigator
-CommonNavigatorTemplate_pagetitle=Common Navigator Settings
-
-# Declarative Services Template
-HelloServiceComponentTemplate_commandTitle = C&ommand:
-HelloServiceComponentTemplate_command = dict
-
-# OSGi EventAdmin Template
-OSGiEventAdminTemplate_eventTopicTitle = &Event:
-OSGiEventAdminTemplate_pageTitle = OSGi EventAdmin Service
-OSGiEventAdminTemplateWizard_title = OSGi EventAdmin Service Wizard
-OSGiEventAdminTemplate_pageDescription = Choose the event topic to listen to

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java
deleted file mode 100644
index 53f2eba..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-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(PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java
deleted file mode 100644
index 0bf7039..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-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.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-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(PDETemplateMessages.HelloNonUIRCPTemplate_title);
-		page.setDescription(PDETemplateMessages.HelloNonUIRCPTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.MailTemplate_packageName, (String) null, 0);
-
-		addOption(KEY_APPLICATION_CLASS, PDETemplateMessages.HelloNonUIRCPTemplate_appClass, "Application", 0); //$NON-NLS-1$
-
-		addOption(KEY_APPLICATION_MESSAGE, PDETemplateMessages.HelloNonUIRCPTemplate_messageText, PDETemplateMessages.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.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.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java
deleted file mode 100644
index 1442735..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-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(PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java
deleted file mode 100644
index e0e6e39..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-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.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-public class HelloRCPTemplate extends PDETemplateSection {
-
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$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(PDETemplateMessages.HelloRCPTemplate_title);
-		page.setDescription(PDETemplateMessages.HelloRCPTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(KEY_WINDOW_TITLE, PDETemplateMessages.HelloRCPTemplate_windowTitle, "Hello RCP", 0); //$NON-NLS-1$ 
-
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.MailTemplate_packageName, (String) null, 0);
-
-		addOption(KEY_APPLICATION_CLASS, PDETemplateMessages.HelloRCPTemplate_appClass, "Application", 0); //$NON-NLS-1$ 
-
-		createBrandingOptions();
-	}
-
-	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 "helloRCP"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		createApplicationExtension();
-		createPerspectiveExtension();
-		if (getBooleanOption(KEY_PRODUCT_BRANDING))
-			createProductExtension();
-	}
-
-	private void createApplicationExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
-		extension.setId(VALUE_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", VALUE_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 createProductExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
-		extension.setId(VALUE_PRODUCT_ID);
-
-		IPluginElement element = model.getFactory().createElement(extension);
-		element.setName("product"); //$NON-NLS-1$
-		element.setAttribute("name", getStringOption(KEY_WINDOW_TITLE)); //$NON-NLS-1$  
-		element.setAttribute("application", plugin.getId() + "." + VALUE_APPLICATION_ID); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement property = model.getFactory().createElement(element);
-
-		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/alt_window_16.gif,icons/alt_window_32.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.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		if (copyBrandingDirectory())
-			return new String[] {"icons/", "splash.bmp"}; //$NON-NLS-1$ //$NON-NLS-2$
-		return super.getNewFiles();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java
deleted file mode 100644
index 6c40d3a..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-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(PDETemplateMessages.IntroNewWizard_wtitle);
-	}
-
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new IntroTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
deleted file mode 100644
index 8ee34a0..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
+++ /dev/null

@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-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.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.AbstractTemplateSection;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-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_GENERATE_DYNAMIC_CONTENT = "IntroTemplate.generateDynamicContent"; //$NON-NLS-1$
-
-	private String packageName;
-	private String introID;
-	private static final String APPLICATION_CLASS = "Application"; //$NON-NLS-1$
-
-	public IntroTemplate() {
-		super();
-		setPageCount(1);
-		createOptions();
-	}
-
-	private void createOptions() {
-
-		addOption(KEY_PRODUCT_NAME, PDETemplateMessages.IntroTemplate_productName, VALUE_PRODUCT_NAME, 0);
-
-		addOption(KEY_GENERATE_DYNAMIC_CONTENT, PDETemplateMessages.IntroTemplate_generate, new String[][] { {STATIC_SELECTED, PDETemplateMessages.IntroTemplate_generateStaticContent}, {DYNAMIC_SELECTED, PDETemplateMessages.IntroTemplate_generateDynamicContent}}, STATIC_SELECTED, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_INTRO);
-		page.setTitle(PDETemplateMessages.IntroTemplate_title);
-		page.setDescription(PDETemplateMessages.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$
-		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$
-		packageName = getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
-		introID = getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
-	}
-
-	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(VALUE_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", VALUE_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);
-
-		createProductExtension();
-
-		// 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$
-				+ '.' + VALUE_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 (getTargetVersion() == 3.0)
-			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);
-		}
-
-	}
-
-	private void createProductExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
-		extension.setId(VALUE_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() + "." + VALUE_APPLICATION_ID); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement property = model.getFactory().createElement(element);
-
-		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/alt_window_16.gif,icons/alt_window_32.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(property);
-
-		extension.add(element);
-
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	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_PACKAGE_NAME)) {
-			return packageName;
-		}
-
-		return super.getStringOption(name);
-	}
-
-	public String[] getNewFiles() {
-		if (getValue(KEY_GENERATE_DYNAMIC_CONTENT).toString().equals(STATIC_SELECTED)) {
-			return new String[] {"icons/", "content/", "splash.bmp", "introContent.xml"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		}
-		return new String[] {"icons/", "content/", "splash.bmp", "introContent.xml", "ext.xml"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#copyBrandingDirectory()
-	 */
-	protected boolean copyBrandingDirectory() {
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java
deleted file mode 100644
index 7685d52..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-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(PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java
deleted file mode 100644
index 1cb0b39..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java
+++ /dev/null

@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-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.IPluginReference;
-import org.eclipse.pde.internal.ui.templates.IHelpContextIds;
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-public class MailTemplate extends PDETemplateSection {
-
-	public static final String KEY_WORKBENCH_ADVISOR = "advisor"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$NON-NLS-1$
-
-	public MailTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDETemplateMessages.MailTemplate_title);
-		page.setDescription(PDETemplateMessages.MailTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(KEY_PRODUCT_NAME, PDETemplateMessages.MailTemplate_productName, VALUE_PRODUCT_NAME, 0);
-
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.MailTemplate_packageName, (String) null, 0); //		
-
-		addOption(KEY_APPLICATION_CLASS, PDETemplateMessages.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);
-	}
-
-	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 "mail"; //$NON-NLS-1$
-	}
-
-	/* (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 (getTargetVersion() >= 3.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(VALUE_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", VALUE_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+Q"); //$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(VALUE_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() + "." + VALUE_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", "RCP Mail template created by PDE"); //$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/", "product_lg.gif", "splash.bmp"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#copyBrandingDirectory()
-	 */
-	protected boolean copyBrandingDirectory() {
-		return true;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java
deleted file mode 100644
index 3a1a5e7..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-import org.eclipse.pde.internal.ui.templates.PDETemplateMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-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(PDETemplateMessages.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.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java
deleted file mode 100644
index 0f35dff..0000000
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java
+++ /dev/null

@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Lars Vogel - bug 265231
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.templates.rcp;
-
-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.internal.ui.templates.*;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.PluginReference;
-
-public class ViewRCPTemplate extends PDETemplateSection {
-
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$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(PDETemplateMessages.ViewRCPTemplate_title);
-		page.setDescription(PDETemplateMessages.ViewRCPTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(KEY_WINDOW_TITLE, PDETemplateMessages.ViewRCPTemplate_windowTitle, "RCP Application", 0); //$NON-NLS-1$ 
-
-		addOption(KEY_PACKAGE_NAME, PDETemplateMessages.ViewRCPTemplate_packageName, (String) null, 0);
-
-		addOption(KEY_APPLICATION_CLASS, PDETemplateMessages.ViewRCPTemplate_appClass, "Application", 0); //$NON-NLS-1$
-
-		createBrandingOptions();
-	}
-
-	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.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		createApplicationExtension();
-		createPerspectiveExtension();
-		createViewExtension();
-		createPerspectiveViewExtension();
-		createMenuExtension();
-
-		if (getBooleanOption(KEY_PRODUCT_BRANDING))
-			createProductExtension();
-	}
-
-	private void createApplicationExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
-		extension.setId(VALUE_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);
-	}
-
-	private void createPerspectiveViewExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		String id = plugin.getId();
-
-		IPluginExtension extension = createExtension("org.eclipse.ui.perspectiveExtensions", true); //$NON-NLS-1$
-		IPluginElement perspectiveExtension = model.getPluginFactory().createElement(extension);
-		perspectiveExtension.setName("perspectiveExtension"); //$NON-NLS-1$
-		perspectiveExtension.setAttribute("targetID", "*"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(perspectiveExtension);
-
-		IPluginElement view = model.getPluginFactory().createElement(perspectiveExtension);
-		view.setName("view"); //$NON-NLS-1$
-		view.setAttribute("id", id + ".view"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("minimized", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("relationship", "left"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("standalone", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("relative", "org.eclipse.ui.editorss"); //$NON-NLS-1$ //$NON-NLS-2$
-		perspectiveExtension.add(view);
-
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	private void createMenuExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.ui.menus", true); //$NON-NLS-1$
-		IPluginElement menuContribution = model.getPluginFactory().createElement(extension);
-		menuContribution.setName("menuContribution"); //$NON-NLS-1$
-		menuContribution.setAttribute("locationURI", "menu:org.eclipse.ui.main.menu"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(menuContribution);
-
-		IPluginElement menu = model.getPluginFactory().createElement(menuContribution);
-		menu.setName("menu"); //$NON-NLS-1$
-		menu.setAttribute("label", "File"); //$NON-NLS-1$ //$NON-NLS-2$
-		menuContribution.add(menu);
-
-		IPluginElement command = model.getPluginFactory().createElement(menu);
-		command.setName("command"); //$NON-NLS-1$
-		command.setAttribute("commandId", "org.eclipse.ui.file.exit"); //$NON-NLS-1$ //$NON-NLS-2$
-		command.setAttribute("label", "Exit"); //$NON-NLS-1$ //$NON-NLS-2$
-		menu.add(command);
-
-		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(VALUE_PRODUCT_ID);
-
-		IPluginElement element = model.getFactory().createElement(extension);
-		element.setName("product"); //$NON-NLS-1$
-		element.setAttribute("name", getStringOption(KEY_WINDOW_TITLE)); //$NON-NLS-1$
-		element.setAttribute("application", plugin.getId() + "." + VALUE_APPLICATION_ID); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement property = model.getFactory().createElement(element);
-
-		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/alt_window_16.gif,icons/alt_window_32.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.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		if (copyBrandingDirectory())
-			return new String[] {"icons/", "splash.bmp"}; //$NON-NLS-1$ //$NON-NLS-2$
-		return super.getNewFiles();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiPreferencesService/java/$activator$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiPreferencesService/java/$activator$.java
deleted file mode 100644
index d4f2816..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiPreferencesService/java/$activator$.java
+++ /dev/null

@@ -1,44 +0,0 @@
-package $packageName$;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.service.prefs.PreferencesService;
-import org.osgi.service.prefs.Preferences;
-
-public class $activator$ implements BundleActivator {
-
-	private ServiceTracker tracker;
-	private PreferencesService service;
-	private static final String COLOR = "color"; //$NON-NLS-1$
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		tracker = new ServiceTracker(context, PreferencesService.class.getName(), null);
-		tracker.open();
-		
-		// grab the service
-		service = (PreferencesService) tracker.getService();
-		Preferences preferences = service.getSystemPreferences();
-		
-		preferences.put(COLOR, "$color$");
-		
-		System.out.println("My favourite color is: " + preferences.get(COLOR, "")); 
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// clean up
-		tracker.close();
-		tracker = null;
-		
-		service = null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/$activator$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/$activator$.java
deleted file mode 100644
index 94be5a7..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/$activator$.java
+++ /dev/null

@@ -1,52 +0,0 @@
-package $packageName$;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class $activator$ implements BundleActivator {
-
-	private ServiceTracker simpleLogServiceTracker;
-	private SimpleLogService simpleLogService;
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		// register the service
-		context.registerService(
-				SimpleLogService.class.getName(), 
-				new SimpleLogServiceImpl(), 
-				new Hashtable());
-		
-		// create a tracker and track the log service
-		simpleLogServiceTracker = 
-			new ServiceTracker(context, SimpleLogService.class.getName(), null);
-		simpleLogServiceTracker.open();
-		
-		// grab the service
-		simpleLogService = (SimpleLogService) simpleLogServiceTracker.getService();
-
-		if(simpleLogService != null)
-			simpleLogService.log("$startLogMessage$");
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if(simpleLogService != null)
-			simpleLogService.log("$stopLogMessage$");
-		
-		// close the service tracker
-		simpleLogServiceTracker.close();
-		simpleLogServiceTracker = null;
-		
-		simpleLogService = null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogService.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogService.java
deleted file mode 100644
index ca69508..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogService.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package $packageName$;
-
-public interface SimpleLogService {
-
-	public void log(String message);
-	
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogServiceImpl.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogServiceImpl.java
deleted file mode 100644
index 5a3ffd9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/OSGiSimpleLogService/java/SimpleLogServiceImpl.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package $packageName$;
-
-public class SimpleLogServiceImpl implements SimpleLogService {
-
-	public void log(String message) {
-		System.out.println(message);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/$builderClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/$builderClassName$.java
deleted file mode 100644
index 5c3aee9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/builder/java/$natureClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/$natureClassName$.java
deleted file mode 100644
index 9dd19f1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/$natureClassName$.java
+++ /dev/null

@@ -1,81 +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);
-				project.setDescription(description, null);			
-				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/templates_3.0/builder/java/ToggleNatureAction.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/builder/java/ToggleNatureAction.java
deleted file mode 100644
index eaf0744..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/decorator/bin/icons/read_only.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/bin/icons/read_only.gif
deleted file mode 100644
index dde3cbd..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/bin/icons/read_only.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/bin/icons/sample_decorator.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/bin/icons/sample_decorator.gif
deleted file mode 100644
index b51281b..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/bin/icons/sample_decorator.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/java/$decoratorClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/java/$decoratorClassName$.java
deleted file mode 100644
index fef3334..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/decorator/java/$decoratorClassName$.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package $packageName$;
-
-import java.net.URL;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourceAttributes;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-
-/**
- * An example showing how to control when an element is decorated. This example
- * decorates only elements that are instances of IResource and whose attribute
- * is 'Read-only'.
- * 
- * @see ILightweightLabelDecorator
- */
-public class $decoratorClassName$ implements ILightweightLabelDecorator {
-	/**
-	 * String constants for the various icon placement options from the template
-	 * wizard.
-	 */
-	public static final String TOP_RIGHT = "TOP_RIGHT";
-
-	public static final String TOP_LEFT = "TOP_LEFT";
-
-	public static final String BOTTOM_RIGHT = "BOTTOM_RIGHT";
-
-	public static final String BOTTOM_LEFT = "BOTTOM_LEFT";
-
-	public static final String UNDERLAY = "UNDERLAY";
-
-	/** The integer value representing the placement options */
-	private int quadrant;
-
-	/** The icon image location in the project folder */
-	private String iconPath = "icons/read_only.gif"; //$NON-NLS-1$
-
-	/**
-	 * The image description used in
-	 * <code>addOverlay(ImageDescriptor, int)</code>
-	 */
-	private ImageDescriptor descriptor;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object, org.eclipse.jface.viewers.IDecoration)
-	 */
-	public void decorate(Object element, IDecoration decoration) {
-		/**
-		 * Checks that the element is an IResource with the 'Read-only' attribute
-		 * and adds the decorator based on the specified image description and the
-		 * integer representation of the placement option.
-		 */
-		IResource resource = (IResource) element;
-		ResourceAttributes attrs = resource.getResourceAttributes();
-		if (attrs.isReadOnly()){
-			URL url = FileLocator.find(
-					Platform.getBundle("$pluginId$"), new Path(iconPath), null); //NON-NLS-1
-
-			if (url == null)
-				return;
-			descriptor = ImageDescriptor.createFromURL(url);			
-%if decoratorPlacement == "BOTTOM_RIGHT"
-			quadrant = IDecoration.BOTTOM_RIGHT;
-%else
-%	if decoratorPlacement == "BOTTOM_LEFT"
-			quadrant = IDecoration.BOTTOM_LEFT;
-%	else
-%		if decoratorPlacement == "TOP_RIGHT"
-			quadrant = IDecoration.TOP_RIGHT;
-%		else
-%			if decoratorPlacement == "TOP_LEFT"
-			quadrant = IDecoration.TOP_LEFT;
-%			else
-%				if decoratorPlacement == "UNDERLAY"
-			quadrant = IDecoration.UNDERLAY;
-%				endif
-%			endif	
-%		endif	
-%	endif
-%endif
-			decoration.addOverlay(descriptor,quadrant);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/$editorClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/$editorClass$.java
deleted file mode 100644
index d248dae..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/ColorManager.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/ColorManager.java
deleted file mode 100644
index f98c700..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/IXMLColorConstants.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/IXMLColorConstants.java
deleted file mode 100644
index 8425b44..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/NonRuleBasedDamagerRepairer.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/NonRuleBasedDamagerRepairer.java
deleted file mode 100644
index 2a90346..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/TagRule.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/TagRule.java
deleted file mode 100644
index a9efd22..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/XMLConfiguration.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLConfiguration.java
deleted file mode 100644
index 31d0c0c..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/XMLDocumentProvider.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLDocumentProvider.java
deleted file mode 100644
index 023b5aa..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/XMLDoubleClickStrategy.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLDoubleClickStrategy.java
deleted file mode 100644
index bc901f7..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/XMLPartitionScanner.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLPartitionScanner.java
deleted file mode 100644
index fd6e2e9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLPartitionScanner.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class XMLPartitionScanner extends RuleBasedPartitionScanner {
-	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/templates_3.0/editor/java/XMLScanner.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLScanner.java
deleted file mode 100644
index c0a2bc2..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/XMLTagScanner.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLTagScanner.java
deleted file mode 100644
index 109a6ee..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/editor/java/XMLWhitespaceDetector.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/editor/java/XMLWhitespaceDetector.java
deleted file mode 100644
index 3faa92a..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/helloNonUIRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloNonUIRCP/java/$applicationClass$.java
deleted file mode 100644
index 573c4b9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/helloOSGi/java/$activator$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGi/java/$activator$.java
deleted file mode 100644
index 8cae3c6..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGi/java/$activator$.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package $packageName$;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class $activator$ implements BundleActivator {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		System.out.println("$startMessage$");
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		System.out.println("$stopMessage$");
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/$activator$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/$activator$.java
deleted file mode 100644
index 9e8953a..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/$activator$.java
+++ /dev/null

@@ -1,76 +0,0 @@
-package $packageName$;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class $activator$ implements BundleActivator, ServiceListener {
-
-	private DictionaryService service;
-	private ServiceTracker dictionaryServiceTracker;
-	private BundleContext fContext;
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		fContext = context;
-		service = new DictionaryServiceImpl();
-
-		Hashtable props = new Hashtable();
-		// register the service
-		context.registerService(DictionaryService.class.getName(), service, props);
-
-		// create a tracker and track the service
-		dictionaryServiceTracker = new ServiceTracker(context, DictionaryService.class.getName(), null);
-		dictionaryServiceTracker.open();
-
-		// have a service listener to implement the whiteboard pattern
-	    fContext.addServiceListener(this, "(objectclass=" + Dictionary.class.getName() + ")");
-		
-		// grab the service
-		service = (DictionaryService) dictionaryServiceTracker.getService();
-		
-		// register the dictionary
-		service.registerDictionary(new DictionaryImpl());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// close the service tracker
-		dictionaryServiceTracker.close();
-		dictionaryServiceTracker = null;
-
-		service = null;
-		fContext = null;
-	}
-
-	public void serviceChanged(ServiceEvent ev) {
-		ServiceReference sr = ev.getServiceReference();
-		switch(ev.getType()) {
-			case ServiceEvent.REGISTERED:
-			{
-				Dictionary dictionary = (Dictionary) fContext.getService(sr);
-				service.registerDictionary(dictionary);
-			}
-			break;
-			case ServiceEvent.UNREGISTERING:
-			{
-				Dictionary dictionary = (Dictionary) fContext.getService(sr);
-				service.unregisterDictionary(dictionary);
-			}
-			break;
-		}
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/Dictionary.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/Dictionary.java
deleted file mode 100755
index e0b0a8d..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/Dictionary.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package $packageName$;
-
-public interface Dictionary {
-	
-    /**
-     * Returns the language of the dictionary
-     *
-     * @return the language of the dictionary
-     */
-    public String getLanguage();
-	
-    /**
-     * Check for the existence of a word in the dictionary
-     * 
-     * @param word the word to be checked.
-     * @return true if the word is in the dictionary
-     */
-    public boolean check(String word);
-
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryImpl.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryImpl.java
deleted file mode 100755
index 582d515..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryImpl.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package $packageName$;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class DictionaryImpl implements Dictionary {
-
-	private List fWords = new ArrayList(Arrays.asList("$word1$", "$word2$", "$word3$"));
-	private String fLanguage = "$language$";
-	
-	public String getLanguage() {
-		return fLanguage;
-	}
-
-	public boolean check(String word) {
-		return fWords.contains(word);
-	}
-	
-	public String toString() {
-		return fLanguage;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryService.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryService.java
deleted file mode 100755
index df0bdde..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryService.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package $packageName$;
-
-public interface DictionaryService {
-	
-    /**
-     * Register a dictionary
-     * 
-     * @param dictionary the dictionary to be added.
-     */
-    public void registerDictionary(Dictionary dictionary);
-    
-    /**
-     * Remove a dictionary
-     * 
-     * @param dictionary the dictionary to be removed.
-     */
-    public void unregisterDictionary(Dictionary dictionary);
-	
-    /**
-     * Check for the existence of a word across all dictionaries
-     * 
-     * @param word the word to be checked.
-     * @return true if the word is in any dictionary
-     */
-    public boolean check(String word);
-
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryServiceImpl.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryServiceImpl.java
deleted file mode 100755
index a486d8c..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryServiceImpl.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package $packageName$;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class DictionaryServiceImpl implements DictionaryService {
-
-	private List fDictionaries = new ArrayList();
-	
-    public void registerDictionary(Dictionary dictionary) {
-    	fDictionaries.add(dictionary);
-    }
-    
-    public void unregisterDictionary(Dictionary dictionary) {
-    	fDictionaries.remove(dictionary);
-    }
-
-	public boolean check(String word) {
-		for (int i = 0; i < fDictionaries.size(); i++ ) {
-			Dictionary dictionary = (Dictionary) fDictionaries.get(i);
-			if(dictionary.check(word))
-				return true;
-		}
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/component.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/component.xml
deleted file mode 100644
index acbb223..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/component.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Command Provider for Dictionary Service">
-   <implementation class="$packageName$.ServiceComponent"/>
-   <service>
-      <provide interface="org.eclipse.osgi.framework.console.CommandProvider"/>
-   </service>
-   <reference bind="setDictionary" cardinality="1..1" interface="$packageName$.DictionaryService" name="Dictionary" policy="static" unbind="unsetDictionary"/>
-</scr:component>

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/dictionary.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/dictionary.xml
deleted file mode 100644
index ada1a30..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/OSGI-INF/dictionary.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Simple Dictionary">
-   <implementation class="$packageName$.DictionaryImpl"/>
-   <service>
-      <provide interface="$packageName$.Dictionary"/>
-   </service>
-</scr:component>

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/build.properties b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/build.properties
deleted file mode 100644
index c58ea21..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/$activator$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/$activator$.java
deleted file mode 100755
index be6c4bb..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/$activator$.java
+++ /dev/null

@@ -1,73 +0,0 @@
-package $packageName$;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class $activator$ implements BundleActivator, ServiceListener {
-
-	private DictionaryService service;
-	private ServiceTracker dictionaryServiceTracker;
-	private BundleContext fContext;
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		fContext = context;
-		service = new DictionaryServiceImpl();
-
-		Hashtable props = new Hashtable();
-		// register the service
-		context.registerService(DictionaryService.class.getName(), service, props);
-
-		// create a tracker and track the service
-		dictionaryServiceTracker = new ServiceTracker(context, DictionaryService.class.getName(), null);
-		dictionaryServiceTracker.open();
-
-		// have a service listener to implement the whiteboard pattern
-	    fContext.addServiceListener(this, "(objectclass=" + Dictionary.class.getName() + ")");
-		
-		// grab the service
-		service = (DictionaryService) dictionaryServiceTracker.getService();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// close the service tracker
-		dictionaryServiceTracker.close();
-		dictionaryServiceTracker = null;
-
-		service = null;
-		fContext = null;
-	}
-
-	public void serviceChanged(ServiceEvent ev) {
-		ServiceReference sr = ev.getServiceReference();
-		switch(ev.getType()) {
-			case ServiceEvent.REGISTERED:
-			{
-				Dictionary dictionary = (Dictionary) fContext.getService(sr);
-				service.registerDictionary(dictionary);
-			}
-			break;
-			case ServiceEvent.UNREGISTERING:
-			{
-				Dictionary dictionary = (Dictionary) fContext.getService(sr);
-				service.unregisterDictionary(dictionary);
-			}
-			break;
-		}
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/Dictionary.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/Dictionary.java
deleted file mode 100755
index e0b0a8d..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/Dictionary.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package $packageName$;
-
-public interface Dictionary {
-	
-    /**
-     * Returns the language of the dictionary
-     *
-     * @return the language of the dictionary
-     */
-    public String getLanguage();
-	
-    /**
-     * Check for the existence of a word in the dictionary
-     * 
-     * @param word the word to be checked.
-     * @return true if the word is in the dictionary
-     */
-    public boolean check(String word);
-
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryImpl.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryImpl.java
deleted file mode 100755
index ecb945d..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryImpl.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package $packageName$;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class DictionaryImpl implements Dictionary {
-
-	private List fWords = new ArrayList(Arrays.asList("$word1$", "$word2$", "$word3$"));
-	private String fLanguage = "en_US";
-	
-	public String getLanguage() {
-		return fLanguage;
-	}
-
-	public boolean check(String word) {
-		return fWords.contains(word);
-	}
-	
-	public String toString() {
-		return fLanguage;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryService.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryService.java
deleted file mode 100755
index 2d19529..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryService.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package $packageName$;
-
-public interface DictionaryService {
-	
-    /**
-     * Register a dictionary
-     * 
-     * @param dictionary the dictionary to be added.
-     */
-    public void registerDictionary(Dictionary dictionary);
-    
-    /**
-     * Remove a dictionary
-     * 
-     * @param dictionary the dictionary to be removed.
-     */
-    public void unregisterDictionary(Dictionary dictionary);
-	
-    /**
-     * Check for the existence of a word across all dictionaries
-     * 
-     * @param word the word to be checked.
-     * @return true if the word is in any dictionary
-     */
-    public boolean check(String word);
-    
-    /**
-     * Return the list of languages supported
-     * 
-     * @return the list of languages in the dictionary
-     */
-    public String[] getLanguages();
-
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryServiceImpl.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryServiceImpl.java
deleted file mode 100755
index df551d5..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryServiceImpl.java
+++ /dev/null

@@ -1,37 +0,0 @@
-package $packageName$;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class DictionaryServiceImpl implements DictionaryService {
-
-	private List fDictionaries = new ArrayList();
-	
-    public void registerDictionary(Dictionary dictionary) {
-    	fDictionaries.add(dictionary);
-    }
-    
-    public void unregisterDictionary(Dictionary dictionary) {
-    	fDictionaries.remove(dictionary);
-    }
-
-	public boolean check(String word) {
-		for (int i = 0; i < fDictionaries.size(); i++ ) {
-			Dictionary dictionary = (Dictionary) fDictionaries.get(i);
-			if(dictionary.check(word))
-				return true;
-		}
-		return false;
-	}
-	
-    public String[] getLanguages() {
-    	List languages = new ArrayList();
-    	for (int i = 0; i < fDictionaries.size(); i++ ) {
-			Dictionary dictionary = (Dictionary) fDictionaries.get(i);
-			languages.add(dictionary.getLanguage());
-		}
-    	return (String[]) languages.toArray(new String[fDictionaries.size()]);
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/ServiceComponent.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/ServiceComponent.java
deleted file mode 100644
index 04434f6..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/ServiceComponent.java
+++ /dev/null

@@ -1,50 +0,0 @@
-package $packageName$;
-
-import org.eclipse.osgi.framework.console.CommandInterpreter;
-import org.eclipse.osgi.framework.console.CommandProvider;
-
-
-// referenced in component.xml
-public class ServiceComponent implements CommandProvider {
-	
-	private DictionaryService dictionary;
-	
-	public void _$command$(CommandInterpreter ci) {
-		String arg = ci.nextArgument();
-		String word = ci.nextArgument();
-		if(arg == null) {
-			return;
-		}
-		if (arg.equalsIgnoreCase("check")) {
-			if(word != null && dictionary.check(word)) {
-				ci.println(word + ": exists in the dictionary");
-			} else {
-				ci.println(word + ": doesn't exist in the dictionary");
-			}
-		}
-		if (arg.equalsIgnoreCase("languages")) {
-			String[] langs = dictionary.getLanguages();
-			for(int i = 0; i < langs.length; i++) {
-				ci.println("Languages available:");
-				ci.println("\t " + langs[i]);
-			}
-		}
-	}
-
-	public String getHelp() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("---Generated by PDE---\n");
-		buffer.append("\t$command$ check <word> - check for the existence of a word\n");
-		buffer.append("\t$command$ languages - list the languages available\n");
-		return buffer.toString();
-	}
-	
-	public void setDictionary(DictionaryService d) {
-		dictionary = d;
-	}
-	
-	public void unsetDictionary(DictionaryService d) {
-		dictionary = null;
-	}
-	
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 5263954..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,23 +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);
-%if productBranding == false
-		configurer.setTitle("$windowTitle$");
-%endif
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloRCP/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/helloWorld/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloWorld/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloWorld/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/helloWorld/java/$className$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/helloWorld/java/$className$.java
deleted file mode 100644
index 632fc8a..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/concepts/maintopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/concepts/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/concepts/subtopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/concepts/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/concepts/subtopic2.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/concepts/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/gettingstarted/maintopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/gettingstarted/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/gettingstarted/subtopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/gettingstarted/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/gettingstarted/subtopic2.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/gettingstarted/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/maintopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/reference/maintopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/reference/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/reference/subtopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/reference/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/reference/subtopic2.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/reference/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/samples/maintopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/samples/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/samples/subtopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/samples/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/samples/subtopic2.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/samples/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/subtopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/tasks/maintopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/tasks/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/tasks/subtopic.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/tasks/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/tasks/subtopic2.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/tasks/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/html/toc.html b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/html/toc.html
deleted file mode 100644
index 326f0a9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/tocconcepts.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocconcepts.xml
deleted file mode 100644
index d01f925..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/tocgettingstarted.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocgettingstarted.xml
deleted file mode 100644
index 38f27e0..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/tocreference.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocreference.xml
deleted file mode 100644
index 660cdec..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/tocsamples.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/tocsamples.xml
deleted file mode 100644
index ddfa61e..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/bin/toctasks.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/bin/toctasks.xml
deleted file mode 100644
index c96b94b..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/testToc.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/testToc.xml
deleted file mode 100644
index bf1e67a..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/help/toc.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/help/toc.xml
deleted file mode 100644
index a07728d..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/importWizard/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardClassName$.java
deleted file mode 100644
index 6ba0ce1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardClassName$.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package $packageName$;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class $wizardClassName$ extends Wizard implements IImportWizard {
-	
-	$wizardPageClassName$ mainPage;
-
-	public $wizardClassName$() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		IFile file = mainPage.createNewFile();
-        if (file == null)
-            return false;
-        return true;
-	}
-	 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle("File Import Wizard"); //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-		mainPage = new $wizardPageClassName$("$wizardImportName$",selection); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.jface.wizard.IWizard#addPages()
-     */
-    public void addPages() {
-        super.addPages(); 
-        addPage(mainPage);        
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardPageClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardPageClassName$.java
deleted file mode 100644
index db8788f..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/importWizard/java/$wizardPageClassName$.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package $packageName$;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-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.preference.FileFieldEditor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.ui.dialogs.WizardNewFileCreationPage;
-
-
-public class $wizardPageClassName$ extends WizardNewFileCreationPage {
-	
-	protected FileFieldEditor editor;
-
-	public $wizardPageClassName$(String pageName, IStructuredSelection selection) {
-		super(pageName, selection);
-		setTitle(pageName); //$NON-NLS-1$
-		setDescription("Import a file from the local file system into the workspace"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createAdvancedControls(org.eclipse.swt.widgets.Composite)
-	 */	
-	protected void createAdvancedControls(Composite parent) {
-		Composite fileSelectionArea = new Composite(parent, SWT.NONE);
-		GridData fileSelectionData = new GridData(GridData.GRAB_HORIZONTAL
-				| GridData.FILL_HORIZONTAL);
-		fileSelectionArea.setLayoutData(fileSelectionData);
-
-		GridLayout fileSelectionLayout = new GridLayout();
-		fileSelectionLayout.numColumns = 3;
-		fileSelectionLayout.makeColumnsEqualWidth = false;
-		fileSelectionLayout.marginWidth = 0;
-		fileSelectionLayout.marginHeight = 0;
-		fileSelectionArea.setLayout(fileSelectionLayout);
-		
-		editor = new FileFieldEditor("fileSelect","Select File: ",fileSelectionArea); //$NON-NLS-1$ //$NON-NLS-2$
-		editor.getTextControl(fileSelectionArea).addModifyListener(new ModifyListener(){
-			public void modifyText(ModifyEvent e) {
-				IPath path = new Path($wizardPageClassName$.this.editor.getStringValue());
-				setFileName(path.lastSegment());
-			}
-		});
-%if wizardFileFilters == "All"
-		String[] extensions = new String[] { "*.*" }; //$NON-NLS-1$
-%else
-%	if wizardFileFilters == "Images"
-		String[] extensions = new String[] { "*.jpg;*.gif;*.bmp" }; //$NON-NLS-1$
-%	else
-%		if wizardFileFilters == "Docs"
-		String[] extensions = new String[] { "*.doc;*.txt;*.pdf" }; //$NON-NLS-1$
-%		else
-%			if wizardFileFilters == "Archives"
-		String[] extensions = new String[] { "*.zip;*.tar;*.jar" }; //$NON-NLS-1$
-%			endif	
-%		endif	
-%	endif
-%endif	
-		editor.setFileExtensions(extensions);
-		fileSelectionArea.moveAbove(null);
-
-	}
-	
-	 /* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createLinkTarget()
-	 */
-	protected void createLinkTarget() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#getInitialContents()
-	 */
-	protected InputStream getInitialContents() {
-		try {
-			return new FileInputStream(new File(editor.getStringValue()));
-		} catch (FileNotFoundException e) {
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#getNewFileLabel()
-	 */
-	protected String getNewFileLabel() {
-		return "New File Name:"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validateLinkedResource()
-	 */
-	protected IStatus validateLinkedResource() {
-		return new Status(IStatus.OK, "$pluginId$", IStatus.OK, "", null); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/link_obj.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/link_obj.gif
deleted file mode 100644
index a4b0788..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/link_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/titlebanner.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/titlebanner.gif
deleted file mode 100644
index 6737f76..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/content/titlebanner.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/content/root.css b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/content/root.css
deleted file mode 100644
index 3413844..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/intro/content/shared.css b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/content/shared.css
deleted file mode 100644
index 4a3de0a..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/intro/ext.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/ext.xml
deleted file mode 100644
index 7b09909..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/intro/introContent.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/introContent.xml
deleted file mode 100644
index 6deb232..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/intro/java/Application.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/Application.java
deleted file mode 100644
index 33a205c..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/intro/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index accafa3..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/intro/java/DynamicContentProvider.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/DynamicContentProvider.java
deleted file mode 100644
index 92af6d4..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/intro/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/intro/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/multiPageEditor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/java/$contributorClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/java/$contributorClassName$.java
deleted file mode 100644
index 2a1d8b4..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/multiPageEditor/java/$editorClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/multiPageEditor/java/$editorClassName$.java
deleted file mode 100644
index 9e388b0..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/newWizard/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/java/$wizardClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/java/$wizardClassName$.java
deleted file mode 100644
index 1449ce0..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/newWizard/java/$wizardPageClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/newWizard/java/$wizardPageClassName$.java
deleted file mode 100644
index 3b7b1c1..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/perspective/bin/icons/releng_gears.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/perspective/bin/icons/releng_gears.gif
deleted file mode 100644
index 81fb7b4..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/perspective/bin/icons/releng_gears.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/perspective/java/$perspectiveClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/perspective/java/$perspectiveClassName$.java
deleted file mode 100644
index d011138..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/perspective/java/$perspectiveClassName$.java
+++ /dev/null

@@ -1,115 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.jdt.ui.JavaUI;
-
-
-/**
- *  This class is meant to serve as an example for how various contributions 
- *  are made to a perspective. Note that some of the extension point id's are
- *  referred to as API constants while others are hardcoded and may be subject 
- *  to change. 
- */
-public class $perspectiveClassName$ implements IPerspectiveFactory {
-
-	private IPageLayout factory;
-
-	public $perspectiveClassName$() {
-		super();
-	}
-
-	public void createInitialLayout(IPageLayout factory) {
-		this.factory = factory;
-		addViews();
-% if(actionSets)	
-		addActionSets();
-% endif
-% if(newWizardShortcuts)
-		addNewWizardShortcuts();
-% endif
-% if(perspectiveShortcuts)	
-		addPerspectiveShortcuts();
-% endif
-% if(showViewShortcuts)	
-		addViewShortcuts();
-% endif
-	}
-
-	private void addViews() {
-		// Creates the overall folder layout. 
-		// Note that each new Folder uses a percentage of the remaining EditorArea.
-		
-		IFolderLayout bottom =
-			factory.createFolder(
-				"bottomRight", //$NON-NLS-1$
-				IPageLayout.BOTTOM,
-				0.75f,
-				factory.getEditorArea());
-		bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
-		bottom.addView("org.eclipse.team.ui.GenericHistoryView"); //$NON-NLS-1$
-		bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW);
-
-		IFolderLayout topLeft =
-			factory.createFolder(
-				"topLeft", //$NON-NLS-1$
-				IPageLayout.LEFT,
-				0.25f,
-				factory.getEditorArea());
-		topLeft.addView(IPageLayout.ID_RES_NAV);
-		topLeft.addView("org.eclipse.jdt.junit.ResultView"); //$NON-NLS-1$
-		
-		factory.addFastView("org.eclipse.team.ccvs.ui.RepositoriesView",0.50f); //$NON-NLS-1$
-		factory.addFastView("org.eclipse.team.sync.views.SynchronizeView", 0.50f); //$NON-NLS-1$
-	}
-
-% if(actionSets)	
-	private void addActionSets() {
-		factory.addActionSet("org.eclipse.debug.ui.launchActionSet"); //$NON-NLS-1$
-		factory.addActionSet("org.eclipse.debug.ui.debugActionSet"); //$NON-NLS-1$
-		factory.addActionSet("org.eclipse.debug.ui.profileActionSet"); //$NON-NLS-1$
-		factory.addActionSet("org.eclipse.jdt.debug.ui.JDTDebugActionSet"); //$NON-NLS-1$
-		factory.addActionSet("org.eclipse.jdt.junit.JUnitActionSet"); //$NON-NLS-1$
-		factory.addActionSet("org.eclipse.team.ui.actionSet"); //$NON-NLS-1$
-		factory.addActionSet("org.eclipse.team.cvs.ui.CVSActionSet"); //$NON-NLS-1$
-		factory.addActionSet("org.eclipse.ant.ui.actionSet.presentation"); //$NON-NLS-1$
-		factory.addActionSet(JavaUI.ID_ACTION_SET);
-		factory.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET);
-		factory.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); //$NON-NLS-1$
-	}
-
-% endif	
-% if(perspectiveShortcuts)	
-	private void addPerspectiveShortcuts() {
-		factory.addPerspectiveShortcut("org.eclipse.team.ui.TeamSynchronizingPerspective"); //$NON-NLS-1$
-		factory.addPerspectiveShortcut("org.eclipse.team.cvs.ui.cvsPerspective"); //$NON-NLS-1$
-		factory.addPerspectiveShortcut("org.eclipse.ui.resourcePerspective"); //$NON-NLS-1$
-	}
-
-% endif
-% if(newWizardShortcuts)
-	private void addNewWizardShortcuts() {
-		factory.addNewWizardShortcut("org.eclipse.team.cvs.ui.newProjectCheckout");//$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$
-	}
-
-% endif	
-% if(showViewShortcuts)	
-	private void addViewShortcuts() {
-		factory.addShowViewShortcut("org.eclipse.ant.ui.views.AntView"); //$NON-NLS-1$
-		factory.addShowViewShortcut("org.eclipse.team.ccvs.ui.AnnotateView"); //$NON-NLS-1$
-		factory.addShowViewShortcut("org.eclipse.pde.ui.DependenciesView"); //$NON-NLS-1$
-		factory.addShowViewShortcut("org.eclipse.jdt.junit.ResultView"); //$NON-NLS-1$
-		factory.addShowViewShortcut("org.eclipse.team.ui.GenericHistoryView"); //$NON-NLS-1$
-		factory.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
-		factory.addShowViewShortcut(JavaUI.ID_PACKAGES);
-		factory.addShowViewShortcut(IPageLayout.ID_RES_NAV);
-		factory.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-		factory.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-	}
-
-% endif
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/popupMenus/java/$actionClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/popupMenus/java/$actionClass$.java
deleted file mode 100644
index c47b6d5..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/popupMenus/java/$actionClass$.java
+++ /dev/null

@@ -1,44 +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 {
-
-	private Shell shell;
-	
-	/**
-	 * Constructor for Action1.
-	 */
-	public $actionClass$() {
-		super();
-	}
-
-	/**
-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		shell = targetPart.getSite().getShell();
-	}
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		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/templates_3.0/preferences/java/$pageClassName$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/$pageClassName$.java
deleted file mode 100644
index 2997fd4..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/$pageClassName$.java
+++ /dev/null

@@ -1,70 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import $pluginClass$;
-
-/**
- * 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)
-% pageClassName
-% pluginClassName
-%
-public class $pageClassName$
-	extends FieldEditorPreferencePage
-	implements IWorkbenchPreferencePage {
-
-	public $pageClassName$() {
-		super(GRID);
-		setPreferenceStore($activator$.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/templates_3.0/preferences/java/PreferenceConstants.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/PreferenceConstants.java
deleted file mode 100644
index 9cc4912..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/preferences/java/PreferenceInitializer.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/PreferenceInitializer.java
deleted file mode 100644
index 224bfd7..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/preferences/java/PreferenceInitializer.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import $pluginClass$;
-
-/**
- * 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 = $activator$.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/templates_3.0/propertyPages/java/$className$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/propertyPages/java/$className$.java
deleted file mode 100644
index 1b3dc1b..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/propertyPages/java/$className$.java
+++ /dev/null

@@ -1,126 +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() {
-		super.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/templates_3.0/view/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/view/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/view/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/view/contexts.xml b/ui/org.eclipse.pde.ui.templates/templates_3.0/view/contexts.xml
deleted file mode 100644
index 24ac00d..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/view/contexts.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<contexts>
-	<context id="viewer" title="Sample View">
-%if viewType =="treeViewer"
-		<description>This is the context help for the sample view with a tree viewer. It was generated by a PDE template.</description>
-%else
-		<description>This is the context help for the sample view with a table viewer. It was generated by a PDE template.</description>
-%endif
-		<topic href="/PLUGINS_ROOT/org.eclipse.platform.doc.isv/guide/ua_help_context.htm" label="Context-sensitive help">
-%if useEnablement
-			<enablement>
-				<with variable="platform">
-	            	<test property="org.eclipse.core.runtime.isBundleInstalled" args="org.eclipse.platform.doc.isv"/>
-	     		</with>
-			</enablement>
-%endif
-		</topic>
-	</context>
-</contexts>

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/view/java/$className$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/view/java/$className$.java
deleted file mode 100644
index 0833cb5..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/view/java/$className$.java
+++ /dev/null

@@ -1,356 +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
-% filter
-% drillDown
-
-public class $className$ extends ViewPart {
-%if addViewID	
-
-	/**
-	 * The ID of the view as specified by the extension.
-	 */
-	public static final String ID = "$packageName$.$className$";
-
-%endif
-%if viewType == "tableViewer"
-	private TableViewer viewer;
-%else
-%  if viewType == "treeViewer"
-	private TreeViewer viewer;
-	private DrillDownAdapter drillDownAdapter;
-%  endif
-%endif
-	private Action action1;
-	private Action action2;
-	private Action doubleClickAction;
-
-	/*
-	 * 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
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * 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());
-		viewer.setSorter(new NameSorter());
-		viewer.setInput(getViewSite());
-%if contextHelp
-
-		// Create the help context id for the viewer's control
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "$pluginId$.viewer");
-%endif
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-		contributeToActionBars();
-	}
-
-	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);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(action1);
-		manager.add(new Separator());
-		manager.add(action2);
-	}
-
-	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));
-	}
-	
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(action1);
-		manager.add(action2);
-%   if viewType == "treeViewer"
-		manager.add(new Separator());
-		drillDownAdapter.addNavigationActions(manager);
-%  endif
-	}
-
-	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));
-		doubleClickAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				showMessage("Double-click detected on "+obj.toString());
-			}
-		};
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-	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/templates_3.0/viewRCP/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 235a62b..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,55 +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);
-%if productBranding == false		
-		configurer.setTitle("$windowTitle$");
-%endif
-	}
-
-	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/templates_3.0/viewRCP/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/Perspective.java
deleted file mode 100644
index 4d16ecf..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.0/viewRCP/java/View.java b/ui/org.eclipse.pde.ui.templates/templates_3.0/viewRCP/java/View.java
deleted file mode 100644
index 8a70946..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/$editorClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/$editorClass$.java
deleted file mode 100644
index d248dae..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/ColorManager.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/ColorManager.java
deleted file mode 100644
index f98c700..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/IXMLColorConstants.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/IXMLColorConstants.java
deleted file mode 100644
index 8425b44..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java
deleted file mode 100644
index cc7b9e4..0000000
--- a/ui/org.eclipse.pde.ui.templates/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.core.runtime.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/templates_3.1/editor/java/TagRule.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/TagRule.java
deleted file mode 100644
index a9efd22..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/XMLConfiguration.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLConfiguration.java
deleted file mode 100644
index 31d0c0c..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/XMLDocumentProvider.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDocumentProvider.java
deleted file mode 100644
index 9536ecf..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/XMLDoubleClickStrategy.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDoubleClickStrategy.java
deleted file mode 100644
index bc901f7..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/XMLPartitionScanner.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLPartitionScanner.java
deleted file mode 100644
index fd6e2e9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLPartitionScanner.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class XMLPartitionScanner extends RuleBasedPartitionScanner {
-	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/templates_3.1/editor/java/XMLScanner.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLScanner.java
deleted file mode 100644
index c0a2bc2..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/XMLTagScanner.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLTagScanner.java
deleted file mode 100644
index 109a6ee..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/editor/java/XMLWhitespaceDetector.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLWhitespaceDetector.java
deleted file mode 100644
index 3faa92a..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/helloRCP/bin/icons/alt_about.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_about.gif
deleted file mode 100644
index 20d9ad2..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_about.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.icns b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.icns
deleted file mode 100644
index b77a6a6..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.icns
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.ico b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.ico
deleted file mode 100644
index d548f71..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.ico
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.xpm b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.xpm
deleted file mode 100644
index b0c139e..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_launcher.xpm
+++ /dev/null

@@ -1,307 +0,0 @@
-/* XPM */

-static char * icon48_xpm[] = {

-"48 48 256 2",

-"  	c #4B4B3B3B9090",

-". 	c #0D0D0E0E5454",

-"X 	c #11110E0E5B5B",

-"o 	c #17170F0F6363",

-"O 	c #1D1D13136969",

-"+ 	c #212114146C6C",

-"@ 	c #252514147171",

-"# 	c #282811116C6C",

-"$ 	c #26260D0D6363",

-"% 	c #22220B0B5E5E",

-"& 	c #1C1C0B0B5A5A",

-"* 	c #1C1C0B0B5252",

-"= 	c #1B1B05055353",

-"- 	c #161606064D4D",

-"; 	c #161605054949",

-": 	c #111104044848",

-"> 	c #131304044545",

-", 	c #131305054242",

-"< 	c #141410105E5E",

-"1 	c #2C2C15157373",

-"2 	c #2B2B1B1B7575",

-"3 	c #343416167272",

-"4 	c #313113136E6E",

-"5 	c #222209095757",

-"6 	c #1B1B06064D4D",

-"7 	c #15150B0B4242",

-"8 	c #13130C0C5555",

-"9 	c #2E2E1B1B7878",

-"0 	c #33331F1F7C7C",

-"q 	c #343418187878",

-"w 	c #3B3B1C1C7575",

-"e 	c #2E2E10106767",

-"r 	c #1B1B07074747",

-"t 	c #18180B0B4646",

-"y 	c #151513136262",

-"u 	c #1A1A15156464",

-"i 	c #34341F1F7777",

-"p 	c #40401E1E8080",

-"a 	c #42421B1B7A7A",

-"s 	c #3B3B15157474",

-"d 	c #2B2B0B0B5B5B",

-"f 	c #222207075252",

-"g 	c #373727277A7A",

-"h 	c #474724248484",

-"j 	c #393915156E6E",

-"k 	c #373711116A6A",

-"l 	c #343413136363",

-"z 	c #232319196E6E",

-"x 	c #292919197070",

-"c 	c #3C3C2C2C8282",

-"v 	c #444431318585",

-"b 	c #494934348A8A",

-"n 	c #505026268A8A",

-"m 	c #3D3D1B1B6E6E",

-"M 	c #31310E0E5C5C",

-"N 	c #2B2B0D0D5353",

-"B 	c #222207074A4A",

-"V 	c #52523C3C9292",

-"C 	c #58583C3C9494",

-"Z 	c #5D5D44449797",

-"A 	c #5C5C2E2E9292",

-"S 	c #676733339595",

-"D 	c #424228287575",

-"F 	c #29290A0A4F4F",

-"G 	c #6C6C4A4A9E9E",

-"H 	c #72725454A7A7",

-"J 	c #8C8C6D6DB2B2",

-"K 	c #343424246E6E",

-"L 	c #3A3A23236A6A",

-"P 	c #3A3A1C1C6767",

-"I 	c #24240A0A4B4B",

-"U 	c #151518186161",

-"Y 	c #76766F6FA5A5",

-"T 	c #ADAD9191CCCC",

-"R 	c #98988989D3D3",

-"E 	c #45453B3B8686",

-"W 	c #3C3C35357979",

-"Q 	c #363631317575",

-"! 	c #32322D2D6B6B",

-"~ 	c #323229296363",

-"^ 	c #30301F1F6262",

-"/ 	c #323218185E5E",

-"( 	c #272707074B4B",

-") 	c #202028286C6C",

-"_ 	c #1E1E1D1D6868",

-"` 	c #9A9A8282BBBB",

-"' 	c #C8C8B3B3D3D3",

-"] 	c #B3B3AFAFE7E7",

-"[ 	c #84847272C6C6",

-"{ 	c #58585757A3A3",

-"} 	c #3F3F3C3C8A8A",

-"| 	c #3B3B3A3A8484",

-" .	c #414139397D7D",

-"..	c #3D3D39397A7A",

-"X.	c #37372E2E6E6E",

-"o.	c #2C2C21215A5A",

-"O.	c #2E2E1B1B5B5B",

-"+.	c #F5F5EFEFF5F5",

-"@.	c #656566669A9A",

-"#.	c #47474B4B8E8E",

-"$.	c #3C3C44447B7B",

-"%.	c #444442428080",

-"&.	c #45453E3E8181",

-"*.	c #40403C3C8181",

-"=.	c #3D3D33337474",

-"-.	c #3B3B30306E6E",

-";.	c #38382D2D6969",

-":.	c #303026265D5D",

-">.	c #2C2C15155A5A",

-",.	c #1F1F1C1C7070",

-"<.	c #25251E1E7171",

-"1.	c #59595C5C9191",

-"2.	c #4D4D53538989",

-"3.	c #4C4C49498484",

-"4.	c #484845458585",

-"5.	c #494941418585",

-"6.	c #494940408181",

-"7.	c #2F2F1C1C5353",

-"8.	c #2B2B28287676",

-"9.	c #323231317F7F",

-"0.	c #545452528B8B",

-"q.	c #51514E4E8989",

-"w.	c #4E4E4B4B8C8C",

-"e.	c #4C4C47478686",

-"r.	c #46463D3D7E7E",

-"t.	c #434336367A7A",

-"y.	c #2B2B13135555",

-"u.	c #47473D3D8D8D",

-"i.	c #575757578E8E",

-"p.	c #48483E3E7F7F",

-"a.	c #46463A3A7D7D",

-"s.	c #424235357575",

-"d.	c #404034347171",

-"f.	c #BFBFCBCBFAFA",

-"g.	c #B8B8A8A8DDDD",

-"h.	c #5E5E60609292",

-"j.	c #565655558C8C",

-"k.	c #4B4B44448282",

-"l.	c #454539397B7B",

-"z.	c #434338387878",

-"x.	c #3F3F32326D6D",

-"c.	c #3D3D30306969",

-"v.	c #3A3A2E2E6363",

-"b.	c #36362A2A5C5C",

-"n.	c #343424245555",

-"m.	c #30301E1E4D4D",

-"M.	c #49493C3C8282",

-"N.	c #5E5E4F4F8C8C",

-"B.	c #56563B3B8B8B",

-"V.	c #545407078585",

-"C.	c #424234347272",

-"Z.	c #9797A4A4F7F7",

-"A.	c #444436367676",

-"S.	c #7D7D7979D5D5",

-"D.	c #464640408A8A",

-"F.	c #44444B4B8282",

-"G.	c #414107077777",

-"H.	c #71716161C1C1",

-"J.	c #303039397979",

-"K.	c #8E8E8E8EE6E6",

-"L.	c #404033338B8B",

-"P.	c #4A4A45458C8C",

-"I.	c #46463A3A8080",

-"U.	c #363629295454",

-"Y.	c #303022224848",

-"T.	c #424237377575",

-"R.	c #2E2E1D1D6363",

-"E.	c #79798383EAEA",

-"W.	c #74747B7BE4E4",

-"Q.	c #6D6D7676D6D6",

-"!.	c #6A6A7171CECE",

-"~.	c #66666969C6C6",

-"^.	c #62626565BCBC",

-"/.	c #5F5F6060B5B5",

-"(.	c #5B5B5B5BACAC",

-").	c #535353539898",

-"_.	c #4F4F4F4FA4A4",

-"`.	c #54544D4DA4A4",

-"'.	c #323204046B6B",

-"].	c #303035357979",

-"[.	c #313122224343",

-"{.	c #5A5A5B5BB7B7",

-"}.	c #484846468080",

-"|.	c #454541417575",

-" X	c #4B4B31318282",

-".X	c #47473C3C8484",

-"XX	c #3E3E35356E6E",

-"oX	c #2F2F26264040",

-"OX	c #2B2B23233A3A",

-"+X	c #262619195C5C",

-"@X	c #252515155A5A",

-"#X	c #55555151B3B3",

-"$X	c #3C3C2D2D5D5D",

-"%X	c #39392F2F5656",

-"&X	c #37372D2D5050",

-"*X	c #25251F1F3030",

-"=X	c #24241D1D4343",

-"-X	c #202013135656",

-";X	c #41413B3B6C6C",

-":X	c #444442429696",

-">X	c #212100005E5E",

-",X	c #444436367272",

-"<X	c #444436366F6F",

-"1X	c #424236366868",

-"2X	c #3F3F34346161",

-"3X	c #3C3C32325A5A",

-"4X	c #34342A2A4A4A",

-"5X	c #21211B1B2121",

-"6X	c #22221C1C6363",

-"7X	c #2D2D01015E5E",

-"8X	c #20201B1B2525",

-"9X	c #49492F2F7B7B",

-"0X	c #434334346C6C",

-"qX	c #323229294545",

-"wX	c #1C1C10104F4F",

-"eX	c #222217176363",

-"rX	c #37371E1E6B6B",

-"tX	c #424232326E6E",

-"yX	c #444433336969",

-"uX	c #424233336565",

-"iX	c #1E1E1A1A1E1E",

-"pX	c #161601014C4C",

-"aX	c #1C1C11115454",

-"sX	c #252503035B5B",

-"dX	c #414131316A6A",

-"fX	c #22221F1F7878",

-"gX	c #272724246767",

-"hX	c #1D1D16165E5E",

-"jX	c #131305055151",

-"kX	c #40402F2F6464",

-"lX	c #111107074E4E",

-"zX	c #0C0C05054B4B",

-"xX	c #22221E1E5757",

-"cX	c #1A1A0D0D4D4D",

-"vX	c #16160B0B4D4D",

-"bX	c #060604044747",

-"nX	c #040403034343",

-"mX	c #3B3B27276565",

-"MX	c #0E0E03034141",

-"NX	c #111106064A4A",

-"BX	c #0E0E04044646",

-"VX	c #111105053B3B",

-"CX	c #0D0D01013A3A",

-"ZX	c #030305053F3F",

-"AX	c #0F0F0F0F4C4C",

-"SX	c #020207073B3B",

-"DX	c #0D0D03034646",

-"FX	c #0B0B02023F3F",

-"GX	c #0D0D02023434",

-"HX	c #0A0A0E0E4444",

-"JX	c #161614145252",

-"KX	c #0B0B04044646",

-"LX	c #0A0A03034444",

-"PX	c #1D1D21215757",

-"IX	c #090910104040",

-"UX	c #18181E1E5353",

-"                                                                                                ",

-"  . . . . X X o o o o O + + @ @ @ @ @ @ @ # # # # # # $ $ % % & & & & * = - - - ; : > > , , ,   ",

-"  . . X X < < o o O O + @ 1 2 2 1 1 1 1 1 1 1 1 3 4 # # $ $ $ % % % 5 = = 6 6 - ; ; > > , , 7   ",

-"  . 8 < < < o O O + @ @ 2 9 9 0 0 q q q q q q q w 3 4 4 e e $ $ $ $ % 5 = = 6 6 6 ; ; > > r t   ",

-"  . X < y u O O + @ 1 2 i 0 0 p p p p p p p a a p a s 3 4 4 e e e e d 5 5 f f 6 6 6 ; ; r r t   ",

-"  X < y u O + + @ 2 9 0 g p p h h h h h h h p h h a a s s j k k j l d d 5 5 f f 6 6 r r r r r   ",

-"  X < y O z x x 9 0 g c v b n n n n n n n n n n n h a a s s j j m l M d d N f f B B B B r r r   ",

-"  < y u + z 2 0 c c b V C Z C C A A A A A S S S n h D w w m m m m k l M d d N f F F F B r r r   ",

-"  < y O z z 9 c b V Z G H H H G S G G J J H V v c g g K K K K L P l l l M M N N N N I B B r r   ",

-"  U u + z x i v C H Y J J J J H J T R H V E W W Q Q Q Q ! ! ! ~ ^ ^ / / M M M M M N ( B B r r   ",

-"  ) _ z x 9 g b Z Y ` ' ' ' T T ] [ { } |  .........W W Q Q X.! ~ ~ o.O./ / / / N F ( B B B r   ",

-"  ) ) z x i c V G J ' +.+.+.+.] [ @.#.$.%.%.%.&.*. . .....W =.-.X.;.~ :.o.O.^ >.N F ( B B B B   ",

-"  ) ,.<.2 g v C H J ' +.+.+.+.T Y 1.2.3.4.4.4.5.6.&.&. . ...W =.=.-.;.~ :.o.7.>.N F F ( B I I   ",

-"  ) ,.<.8.9.b C H J T +.+.+.' J @.1.0.q.q.w.e.4.5.6.&.r. . .t.W =.=.-.;.~ :.o.7.y.N F ( ( I I   ",

-"  8.8.8.9.| u.C G J T +.+.' ` Y @.1.i.0.q.q.e.e.5.6.p.r.a. .t.t.s.d.d.-.;.~ :.7.7.y.F F ( I I   ",

-"  9.c c c v b A S H ' f.g.` Y @.h.1.i.j.0.q.q.e.k.6.p.r.a.l.t.z.s.s.d.x.c.v.b.n.m.7.N F F F I   ",

-"  <.g M.N.B.B.n V.J f.R J @.h.h.1.i.i.j.j.0.q.3.k.6.p.r.a.l.l.z.s.C.d.x.x.c.v.b.n.m.y.N F F F   ",

-"  + x i v B.Z Z G g.Z.[ @.2.i.i.j.j.j.j.j.0.q.3.k.6.p.p.a.l.l.A.s.C.C.d.x.c.v.b.n.m.7.y.N N y.  ",

-"  O # 3 w p n Z ` f.S.H D.F.q.0.0.0.0.j.0.q.q.3.k.6.p.r.a.a.l.A.s.s.C.d.x.x.c.v.b.n.m.y.y.y.y.  ",

-"  O # 4 s a G.V.T Z.H.V J.%.e.w.q.0.0.0.0.q.q.e.k.6.p.r.a.a.l.z.A.s.C.d.d.x.c.v.b.n.m.7.>.y.y.  ",

-"  O # 4 s w G.A f.K.H L...4.P.w.w.w.q.q.q.q.e.e.5.6.M.I.I.a.a.l.z.A.s.d.d.x.c.v.v.U.Y.7.O.>.y.  ",

-"  $ # 4 3 s G.G f.S.Z 9.*.D.P.P.w.w.w.w.w.e.e.5.5.M.M.I.I.a.a.l.z.T.s.d.d.x.x.c.v.U.Y.m.R.>.>.  ",

-"  E.E.W.W.W.W.E.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { )._.`._.  ",

-"  + # 3 w s '.` f.H.V ].*.D.P.P.P.P.P.P.P.5.5.5.M.M.M.I.I.a.l.z.z.T.T.s.d.d.x.c.v.U.Y.[.^ O.>.  ",

-"  ~.~.~.~.~.~.K.Z.S.~.{.^.^.^.^.^.^.^.^././././././.(.(.(.(.(.(.{ { { { { ).).).w.w.}.|.P.u.}   ",

-"   .I.6. X X XT f.H.b ].*.E D.D.D.D.5.5..X.XM.M.I.I.a.a.l.l.z.z.T.T.T.d.XXx.c.v.b.U.oXOXR.+X@X  ",

-"  E.E.E.W.W.W.K.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { ).).#X_._.  ",

-"  & % $ e '.= H f.H.b 8.W *.E E E .X.X.XI.I.I.I.a.a.l.l.z.z.T.T.T.C.XXXXc.v.$X%X&XY.*X=X2 @X-X  ",

-"  {.{.{.{.{.#X~.Z.W.~.{.{./././././././././.(.(.(.(.(.(.(.{ { { { { { ).).).w.w.3.}.;X%.:X} }   ",

-"  & & % $ e >XV.f.S.C K X.W t. . .l.l.t.t.t.t.A.A.A.,X,X,X,X,X<X;X1X1X2X3X%X&X4XoX*X5Xo.6X-X-X  ",

-"  & & % $ $ >X7X` Z.Z D ! =.=.s.t.t.t.A.A.s.A.,X,X,X,X<X<X<X<X;X1X2X2X3X%X&X4XoXOX8X5X<.@X-X-X  ",

-"  8 & & $ e K 9XJ f.^. XK X.=.=.s.s.s.s.s.C.C.C.C.<X0X0X0X1X1X1X2X2X3X%X&X4XqXOX*X8X=X<.-X-XwX  ",

-"  8 & eXK k.@.M. Xg.E.B.rX~ -.d.d.C.C.C.C.C.tX0X0X0XyXyX1X1XuX2X2X3X%X&X4XqXoXOX8XiX6XeX-X-XwX  ",

-"  6XQ h.Y N.K e pXB.f./.9Xo.;.-.x.d.tXtXtXtXtX0X0XyXyXyXuXuX2X2X3X%X&X4XqXoXOX*XiX=X_ aX-XaXwX  ",

-"  Y Y  .R.@X% sX= 7XT Z.V P :.;.c.x.x.x.tXdXdXdXyXyXuXuX2X2X3X3X%X&X4XqXoXOX*X8X*XfXaXaXaXwXwX  ",

-"  gXhX& * & 5 5 sXjXa ] S.9X/ ~ v.c.dXdXdXdXdXuXuXuXkX2X2X3X%X%X&X4XqXoXOX*X8XiX<.hXwXwXaXwXwX  ",

-"  8 lXlXjX= * 5 5 = zX9X] H.D 7.b.v.v.kXc.kXkXkXkXkX2X$X3X%X&X&X4XqXoXOX*X8XiXxXhXwXcXcXwXwXwX  ",

-"  zXzXlXlXjX= = f f sXD Y ] ~.D 7.n.b.v.v.kXkXkXkX$X$X%X%X&X4XqXoXoXOX*X8X5XgXu cXvXvXcXcXwXwX  ",

-"  bXbXzXlXlX- = * @XX.h.e D T S.D n.m.b.$X$X$X$X$X%X%X&X&X4XqXoXOX*X8X8X*X<.hXvX; ; vXvXvXcXwX  ",

-"  nXbXzXzXlXlX- -XX.Y R.pXpXP J K.Z mXm.n.U.U.U.U.U.4X4XY.oXOX*X8X8X8X=X,.aXvX; > > > t t t cX  ",

-"  nXbXbXzXzXlXaXXXY +Xf = f = 7XtXR R   mXn.Y.[.[.[.[.OX*X*X8X5X*X=X,.u vXvX; > > MXMX, 7 t t   ",

-"  nXnXnXbXzXvX-.Y +XcX6 6 = = = d L B.G H `.X.:.7.m.=X=X=X=X=X6X,.u cXvXNX: BX> MXVXCXVX7 7 7   ",

-"  ZXZXnXbXAXgX@.+XvX; - - - - * @XR.>.sX>.R.i 0 x eXeXeXeXO hXaXcXvXNX: BXMXMXMXVXCXCXCXVX7 7   ",

-"  SXZXZXAXgXN.aXNX: : NXNXNX- * +X+X* 6 6 6 * * * * * * * vXvX- NX: DXBXMXMXFXCXCXCXCXGXVXVX7   ",

-"  SXSXHXgX0.JXKXLXKXKXDX: : NX* @X-X- - - - - - - - - - - NX: DXDXDXMXMXFXFXCXCXCXCXGXGXGXVXVX  ",

-"  SXHXPX3.JXnXnXnXnXbXLXKXKXNXaX-XvX: : NX: : : : : : : BXDXDXLXMXMXFXFXCXCXCXCXGXGXGXGXGXGXGX  ",

-"  IXUX$.AXZXZXZXZXnXnXnXLXLXNXJXvXBXDXBXBXBXBXDXDXDXDXLXDXLXLXFXFXFXFXCXCXCXCXGXGXGXGXGXGXGXGX  ",

-"                                                                                                "};


diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/helloRCP/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 91c7c98..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/helloRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index d257049..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 744b0cb..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,28 +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);
-%if productBranding == false
-        configurer.setTitle("$windowTitle$");
-%endif
-    }
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/helloRCP/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/bin/content/link_obj.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/content/link_obj.gif
deleted file mode 100644
index a4b0788..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/content/link_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/content/titlebanner.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/content/titlebanner.gif
deleted file mode 100644
index 6737f76..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/content/titlebanner.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/concept1.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/concept1.xhtml
deleted file mode 100644
index 839c9f8..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/content/concept2.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/concept2.xhtml
deleted file mode 100644
index aab6830..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/content/concept3.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/concept3.xhtml
deleted file mode 100644
index c27f382..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/content/extContent.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/extContent.xhtml
deleted file mode 100644
index 80a9665..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/content/root.css b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/root.css
deleted file mode 100644
index 7cf89fc..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/content/root.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/root.xhtml
deleted file mode 100644
index 182f2cd..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/content/shared.css b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/content/shared.css
deleted file mode 100644
index 8a05736..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/ext.xml b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/ext.xml
deleted file mode 100644
index d08a22a..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/introContent.xml b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/introContent.xml
deleted file mode 100644
index c5dff2d..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/java/Application.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/Application.java
deleted file mode 100644
index 33a205c..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 475c67b..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index f29f957..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 65072fe..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/java/DynamicContentProvider.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/DynamicContentProvider.java
deleted file mode 100644
index d2b442a..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/intro/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/intro/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/bin/icons/mail.ico b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/mail.ico
deleted file mode 100644
index b000061..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/mail.ico
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.icns b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.icns
deleted file mode 100644
index 1e92ccc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample.icns
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample2.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample2.gif
deleted file mode 100644
index 252d7eb..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample2.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample3.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample3.gif
deleted file mode 100644
index b949ac9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/icons/sample3.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/product_lg.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/product_lg.gif
deleted file mode 100644
index bd95e28..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/bin/product_lg.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 88d8b9c..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 2cf26b5..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 57183c0..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/ICommandIds.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/ICommandIds.java
deleted file mode 100644
index dd6d40e..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/MessagePopupAction.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/MessagePopupAction.java
deleted file mode 100644
index 8976bb4..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/NavigationView.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/NavigationView.java
deleted file mode 100644
index aaae601..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/OpenViewAction.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/OpenViewAction.java
deleted file mode 100644
index 7ea8882..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/Perspective.java
deleted file mode 100644
index 86a9dd9..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/mail/java/View.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/View.java
deleted file mode 100644
index 9b87452..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/mail/java/View.java
+++ /dev/null

@@ -1,83 +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";
-
-	/**
-	 * The text control that's displaying the content of the email message.
-	 */
-	private Text messageText;
-	
-	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
-		messageText = new Text(top, SWT.MULTI | SWT.WRAP);
-		messageText.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");
-		messageText.setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	public void setFocus() {
-		messageText.setFocus();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/viewRCP/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 623c61b..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/viewRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index ac5e997..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 683fadc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,29 +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);
-%if productBranding == false		
-		configurer.setTitle("$windowTitle$");
-%endif
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/Perspective.java
deleted file mode 100644
index 4d16ecf..0000000
--- a/ui/org.eclipse.pde.ui.templates/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/templates_3.1/viewRCP/java/View.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/viewRCP/java/View.java
deleted file mode 100644
index 8a70946..0000000
--- a/ui/org.eclipse.pde.ui.templates/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

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/css/sample.css b/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/css/sample.css
deleted file mode 100644
index d27b27f..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/css/sample.css
+++ /dev/null

@@ -1,3 +0,0 @@
-

-a#$linkId$ img { background-image : url(graphics/sample.gif); }

-a#$linkId$:hover img { background-image : url(graphics/sample_hov.gif); }
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/sample.xml b/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/sample.xml
deleted file mode 100644
index 263a349..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/$introDir$/sample.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="$extensionId$" style="css/sample.css" name="Sample Extension" path="$path$">
-		<group style-id="content-group" id="$linkId$-group">
-       		<link label="Lorem ipsum" url="$linkUrl$" id="$linkId$" style-id="content-link">
-          		<text>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample.gif
deleted file mode 100644
index 5ff1ffc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample_hov.gif b/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample_hov.gif
deleted file mode 100644
index 6874164..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.2/universalWelcome/bin/$introDir$/css/graphics/sample_hov.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloNonUIRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloNonUIRCP/java/$applicationClass$.java
deleted file mode 100644
index dee7e35..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloNonUIRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package $packageName$;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IApplication {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) throws Exception {
-		System.out.println("$message$");
-		return IApplication.EXIT_OK;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		// nothing to do
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_about.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_about.gif
deleted file mode 100644
index 20d9ad2..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_about.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.icns b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.icns
deleted file mode 100644
index b77a6a6..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.icns
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.ico b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.ico
deleted file mode 100644
index d548f71..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.ico
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.xpm b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.xpm
deleted file mode 100644
index b0c139e..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_launcher.xpm
+++ /dev/null

@@ -1,307 +0,0 @@
-/* XPM */

-static char * icon48_xpm[] = {

-"48 48 256 2",

-"  	c #4B4B3B3B9090",

-". 	c #0D0D0E0E5454",

-"X 	c #11110E0E5B5B",

-"o 	c #17170F0F6363",

-"O 	c #1D1D13136969",

-"+ 	c #212114146C6C",

-"@ 	c #252514147171",

-"# 	c #282811116C6C",

-"$ 	c #26260D0D6363",

-"% 	c #22220B0B5E5E",

-"& 	c #1C1C0B0B5A5A",

-"* 	c #1C1C0B0B5252",

-"= 	c #1B1B05055353",

-"- 	c #161606064D4D",

-"; 	c #161605054949",

-": 	c #111104044848",

-"> 	c #131304044545",

-", 	c #131305054242",

-"< 	c #141410105E5E",

-"1 	c #2C2C15157373",

-"2 	c #2B2B1B1B7575",

-"3 	c #343416167272",

-"4 	c #313113136E6E",

-"5 	c #222209095757",

-"6 	c #1B1B06064D4D",

-"7 	c #15150B0B4242",

-"8 	c #13130C0C5555",

-"9 	c #2E2E1B1B7878",

-"0 	c #33331F1F7C7C",

-"q 	c #343418187878",

-"w 	c #3B3B1C1C7575",

-"e 	c #2E2E10106767",

-"r 	c #1B1B07074747",

-"t 	c #18180B0B4646",

-"y 	c #151513136262",

-"u 	c #1A1A15156464",

-"i 	c #34341F1F7777",

-"p 	c #40401E1E8080",

-"a 	c #42421B1B7A7A",

-"s 	c #3B3B15157474",

-"d 	c #2B2B0B0B5B5B",

-"f 	c #222207075252",

-"g 	c #373727277A7A",

-"h 	c #474724248484",

-"j 	c #393915156E6E",

-"k 	c #373711116A6A",

-"l 	c #343413136363",

-"z 	c #232319196E6E",

-"x 	c #292919197070",

-"c 	c #3C3C2C2C8282",

-"v 	c #444431318585",

-"b 	c #494934348A8A",

-"n 	c #505026268A8A",

-"m 	c #3D3D1B1B6E6E",

-"M 	c #31310E0E5C5C",

-"N 	c #2B2B0D0D5353",

-"B 	c #222207074A4A",

-"V 	c #52523C3C9292",

-"C 	c #58583C3C9494",

-"Z 	c #5D5D44449797",

-"A 	c #5C5C2E2E9292",

-"S 	c #676733339595",

-"D 	c #424228287575",

-"F 	c #29290A0A4F4F",

-"G 	c #6C6C4A4A9E9E",

-"H 	c #72725454A7A7",

-"J 	c #8C8C6D6DB2B2",

-"K 	c #343424246E6E",

-"L 	c #3A3A23236A6A",

-"P 	c #3A3A1C1C6767",

-"I 	c #24240A0A4B4B",

-"U 	c #151518186161",

-"Y 	c #76766F6FA5A5",

-"T 	c #ADAD9191CCCC",

-"R 	c #98988989D3D3",

-"E 	c #45453B3B8686",

-"W 	c #3C3C35357979",

-"Q 	c #363631317575",

-"! 	c #32322D2D6B6B",

-"~ 	c #323229296363",

-"^ 	c #30301F1F6262",

-"/ 	c #323218185E5E",

-"( 	c #272707074B4B",

-") 	c #202028286C6C",

-"_ 	c #1E1E1D1D6868",

-"` 	c #9A9A8282BBBB",

-"' 	c #C8C8B3B3D3D3",

-"] 	c #B3B3AFAFE7E7",

-"[ 	c #84847272C6C6",

-"{ 	c #58585757A3A3",

-"} 	c #3F3F3C3C8A8A",

-"| 	c #3B3B3A3A8484",

-" .	c #414139397D7D",

-"..	c #3D3D39397A7A",

-"X.	c #37372E2E6E6E",

-"o.	c #2C2C21215A5A",

-"O.	c #2E2E1B1B5B5B",

-"+.	c #F5F5EFEFF5F5",

-"@.	c #656566669A9A",

-"#.	c #47474B4B8E8E",

-"$.	c #3C3C44447B7B",

-"%.	c #444442428080",

-"&.	c #45453E3E8181",

-"*.	c #40403C3C8181",

-"=.	c #3D3D33337474",

-"-.	c #3B3B30306E6E",

-";.	c #38382D2D6969",

-":.	c #303026265D5D",

-">.	c #2C2C15155A5A",

-",.	c #1F1F1C1C7070",

-"<.	c #25251E1E7171",

-"1.	c #59595C5C9191",

-"2.	c #4D4D53538989",

-"3.	c #4C4C49498484",

-"4.	c #484845458585",

-"5.	c #494941418585",

-"6.	c #494940408181",

-"7.	c #2F2F1C1C5353",

-"8.	c #2B2B28287676",

-"9.	c #323231317F7F",

-"0.	c #545452528B8B",

-"q.	c #51514E4E8989",

-"w.	c #4E4E4B4B8C8C",

-"e.	c #4C4C47478686",

-"r.	c #46463D3D7E7E",

-"t.	c #434336367A7A",

-"y.	c #2B2B13135555",

-"u.	c #47473D3D8D8D",

-"i.	c #575757578E8E",

-"p.	c #48483E3E7F7F",

-"a.	c #46463A3A7D7D",

-"s.	c #424235357575",

-"d.	c #404034347171",

-"f.	c #BFBFCBCBFAFA",

-"g.	c #B8B8A8A8DDDD",

-"h.	c #5E5E60609292",

-"j.	c #565655558C8C",

-"k.	c #4B4B44448282",

-"l.	c #454539397B7B",

-"z.	c #434338387878",

-"x.	c #3F3F32326D6D",

-"c.	c #3D3D30306969",

-"v.	c #3A3A2E2E6363",

-"b.	c #36362A2A5C5C",

-"n.	c #343424245555",

-"m.	c #30301E1E4D4D",

-"M.	c #49493C3C8282",

-"N.	c #5E5E4F4F8C8C",

-"B.	c #56563B3B8B8B",

-"V.	c #545407078585",

-"C.	c #424234347272",

-"Z.	c #9797A4A4F7F7",

-"A.	c #444436367676",

-"S.	c #7D7D7979D5D5",

-"D.	c #464640408A8A",

-"F.	c #44444B4B8282",

-"G.	c #414107077777",

-"H.	c #71716161C1C1",

-"J.	c #303039397979",

-"K.	c #8E8E8E8EE6E6",

-"L.	c #404033338B8B",

-"P.	c #4A4A45458C8C",

-"I.	c #46463A3A8080",

-"U.	c #363629295454",

-"Y.	c #303022224848",

-"T.	c #424237377575",

-"R.	c #2E2E1D1D6363",

-"E.	c #79798383EAEA",

-"W.	c #74747B7BE4E4",

-"Q.	c #6D6D7676D6D6",

-"!.	c #6A6A7171CECE",

-"~.	c #66666969C6C6",

-"^.	c #62626565BCBC",

-"/.	c #5F5F6060B5B5",

-"(.	c #5B5B5B5BACAC",

-").	c #535353539898",

-"_.	c #4F4F4F4FA4A4",

-"`.	c #54544D4DA4A4",

-"'.	c #323204046B6B",

-"].	c #303035357979",

-"[.	c #313122224343",

-"{.	c #5A5A5B5BB7B7",

-"}.	c #484846468080",

-"|.	c #454541417575",

-" X	c #4B4B31318282",

-".X	c #47473C3C8484",

-"XX	c #3E3E35356E6E",

-"oX	c #2F2F26264040",

-"OX	c #2B2B23233A3A",

-"+X	c #262619195C5C",

-"@X	c #252515155A5A",

-"#X	c #55555151B3B3",

-"$X	c #3C3C2D2D5D5D",

-"%X	c #39392F2F5656",

-"&X	c #37372D2D5050",

-"*X	c #25251F1F3030",

-"=X	c #24241D1D4343",

-"-X	c #202013135656",

-";X	c #41413B3B6C6C",

-":X	c #444442429696",

-">X	c #212100005E5E",

-",X	c #444436367272",

-"<X	c #444436366F6F",

-"1X	c #424236366868",

-"2X	c #3F3F34346161",

-"3X	c #3C3C32325A5A",

-"4X	c #34342A2A4A4A",

-"5X	c #21211B1B2121",

-"6X	c #22221C1C6363",

-"7X	c #2D2D01015E5E",

-"8X	c #20201B1B2525",

-"9X	c #49492F2F7B7B",

-"0X	c #434334346C6C",

-"qX	c #323229294545",

-"wX	c #1C1C10104F4F",

-"eX	c #222217176363",

-"rX	c #37371E1E6B6B",

-"tX	c #424232326E6E",

-"yX	c #444433336969",

-"uX	c #424233336565",

-"iX	c #1E1E1A1A1E1E",

-"pX	c #161601014C4C",

-"aX	c #1C1C11115454",

-"sX	c #252503035B5B",

-"dX	c #414131316A6A",

-"fX	c #22221F1F7878",

-"gX	c #272724246767",

-"hX	c #1D1D16165E5E",

-"jX	c #131305055151",

-"kX	c #40402F2F6464",

-"lX	c #111107074E4E",

-"zX	c #0C0C05054B4B",

-"xX	c #22221E1E5757",

-"cX	c #1A1A0D0D4D4D",

-"vX	c #16160B0B4D4D",

-"bX	c #060604044747",

-"nX	c #040403034343",

-"mX	c #3B3B27276565",

-"MX	c #0E0E03034141",

-"NX	c #111106064A4A",

-"BX	c #0E0E04044646",

-"VX	c #111105053B3B",

-"CX	c #0D0D01013A3A",

-"ZX	c #030305053F3F",

-"AX	c #0F0F0F0F4C4C",

-"SX	c #020207073B3B",

-"DX	c #0D0D03034646",

-"FX	c #0B0B02023F3F",

-"GX	c #0D0D02023434",

-"HX	c #0A0A0E0E4444",

-"JX	c #161614145252",

-"KX	c #0B0B04044646",

-"LX	c #0A0A03034444",

-"PX	c #1D1D21215757",

-"IX	c #090910104040",

-"UX	c #18181E1E5353",

-"                                                                                                ",

-"  . . . . X X o o o o O + + @ @ @ @ @ @ @ # # # # # # $ $ % % & & & & * = - - - ; : > > , , ,   ",

-"  . . X X < < o o O O + @ 1 2 2 1 1 1 1 1 1 1 1 3 4 # # $ $ $ % % % 5 = = 6 6 - ; ; > > , , 7   ",

-"  . 8 < < < o O O + @ @ 2 9 9 0 0 q q q q q q q w 3 4 4 e e $ $ $ $ % 5 = = 6 6 6 ; ; > > r t   ",

-"  . X < y u O O + @ 1 2 i 0 0 p p p p p p p a a p a s 3 4 4 e e e e d 5 5 f f 6 6 6 ; ; r r t   ",

-"  X < y u O + + @ 2 9 0 g p p h h h h h h h p h h a a s s j k k j l d d 5 5 f f 6 6 r r r r r   ",

-"  X < y O z x x 9 0 g c v b n n n n n n n n n n n h a a s s j j m l M d d N f f B B B B r r r   ",

-"  < y u + z 2 0 c c b V C Z C C A A A A A S S S n h D w w m m m m k l M d d N f F F F B r r r   ",

-"  < y O z z 9 c b V Z G H H H G S G G J J H V v c g g K K K K L P l l l M M N N N N I B B r r   ",

-"  U u + z x i v C H Y J J J J H J T R H V E W W Q Q Q Q ! ! ! ~ ^ ^ / / M M M M M N ( B B r r   ",

-"  ) _ z x 9 g b Z Y ` ' ' ' T T ] [ { } |  .........W W Q Q X.! ~ ~ o.O./ / / / N F ( B B B r   ",

-"  ) ) z x i c V G J ' +.+.+.+.] [ @.#.$.%.%.%.&.*. . .....W =.-.X.;.~ :.o.O.^ >.N F ( B B B B   ",

-"  ) ,.<.2 g v C H J ' +.+.+.+.T Y 1.2.3.4.4.4.5.6.&.&. . ...W =.=.-.;.~ :.o.7.>.N F F ( B I I   ",

-"  ) ,.<.8.9.b C H J T +.+.+.' J @.1.0.q.q.w.e.4.5.6.&.r. . .t.W =.=.-.;.~ :.o.7.y.N F ( ( I I   ",

-"  8.8.8.9.| u.C G J T +.+.' ` Y @.1.i.0.q.q.e.e.5.6.p.r.a. .t.t.s.d.d.-.;.~ :.7.7.y.F F ( I I   ",

-"  9.c c c v b A S H ' f.g.` Y @.h.1.i.j.0.q.q.e.k.6.p.r.a.l.t.z.s.s.d.x.c.v.b.n.m.7.N F F F I   ",

-"  <.g M.N.B.B.n V.J f.R J @.h.h.1.i.i.j.j.0.q.3.k.6.p.r.a.l.l.z.s.C.d.x.x.c.v.b.n.m.y.N F F F   ",

-"  + x i v B.Z Z G g.Z.[ @.2.i.i.j.j.j.j.j.0.q.3.k.6.p.p.a.l.l.A.s.C.C.d.x.c.v.b.n.m.7.y.N N y.  ",

-"  O # 3 w p n Z ` f.S.H D.F.q.0.0.0.0.j.0.q.q.3.k.6.p.r.a.a.l.A.s.s.C.d.x.x.c.v.b.n.m.y.y.y.y.  ",

-"  O # 4 s a G.V.T Z.H.V J.%.e.w.q.0.0.0.0.q.q.e.k.6.p.r.a.a.l.z.A.s.C.d.d.x.c.v.b.n.m.7.>.y.y.  ",

-"  O # 4 s w G.A f.K.H L...4.P.w.w.w.q.q.q.q.e.e.5.6.M.I.I.a.a.l.z.A.s.d.d.x.c.v.v.U.Y.7.O.>.y.  ",

-"  $ # 4 3 s G.G f.S.Z 9.*.D.P.P.w.w.w.w.w.e.e.5.5.M.M.I.I.a.a.l.z.T.s.d.d.x.x.c.v.U.Y.m.R.>.>.  ",

-"  E.E.W.W.W.W.E.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { )._.`._.  ",

-"  + # 3 w s '.` f.H.V ].*.D.P.P.P.P.P.P.P.5.5.5.M.M.M.I.I.a.l.z.z.T.T.s.d.d.x.c.v.U.Y.[.^ O.>.  ",

-"  ~.~.~.~.~.~.K.Z.S.~.{.^.^.^.^.^.^.^.^././././././.(.(.(.(.(.(.{ { { { { ).).).w.w.}.|.P.u.}   ",

-"   .I.6. X X XT f.H.b ].*.E D.D.D.D.5.5..X.XM.M.I.I.a.a.l.l.z.z.T.T.T.d.XXx.c.v.b.U.oXOXR.+X@X  ",

-"  E.E.E.W.W.W.K.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { ).).#X_._.  ",

-"  & % $ e '.= H f.H.b 8.W *.E E E .X.X.XI.I.I.I.a.a.l.l.z.z.T.T.T.C.XXXXc.v.$X%X&XY.*X=X2 @X-X  ",

-"  {.{.{.{.{.#X~.Z.W.~.{.{./././././././././.(.(.(.(.(.(.(.{ { { { { { ).).).w.w.3.}.;X%.:X} }   ",

-"  & & % $ e >XV.f.S.C K X.W t. . .l.l.t.t.t.t.A.A.A.,X,X,X,X,X<X;X1X1X2X3X%X&X4XoX*X5Xo.6X-X-X  ",

-"  & & % $ $ >X7X` Z.Z D ! =.=.s.t.t.t.A.A.s.A.,X,X,X,X<X<X<X<X;X1X2X2X3X%X&X4XoXOX8X5X<.@X-X-X  ",

-"  8 & & $ e K 9XJ f.^. XK X.=.=.s.s.s.s.s.C.C.C.C.<X0X0X0X1X1X1X2X2X3X%X&X4XqXOX*X8X=X<.-X-XwX  ",

-"  8 & eXK k.@.M. Xg.E.B.rX~ -.d.d.C.C.C.C.C.tX0X0X0XyXyX1X1XuX2X2X3X%X&X4XqXoXOX8XiX6XeX-X-XwX  ",

-"  6XQ h.Y N.K e pXB.f./.9Xo.;.-.x.d.tXtXtXtXtX0X0XyXyXyXuXuX2X2X3X%X&X4XqXoXOX*XiX=X_ aX-XaXwX  ",

-"  Y Y  .R.@X% sX= 7XT Z.V P :.;.c.x.x.x.tXdXdXdXyXyXuXuX2X2X3X3X%X&X4XqXoXOX*X8X*XfXaXaXaXwXwX  ",

-"  gXhX& * & 5 5 sXjXa ] S.9X/ ~ v.c.dXdXdXdXdXuXuXuXkX2X2X3X%X%X&X4XqXoXOX*X8XiX<.hXwXwXaXwXwX  ",

-"  8 lXlXjX= * 5 5 = zX9X] H.D 7.b.v.v.kXc.kXkXkXkXkX2X$X3X%X&X&X4XqXoXOX*X8XiXxXhXwXcXcXwXwXwX  ",

-"  zXzXlXlXjX= = f f sXD Y ] ~.D 7.n.b.v.v.kXkXkXkX$X$X%X%X&X4XqXoXoXOX*X8X5XgXu cXvXvXcXcXwXwX  ",

-"  bXbXzXlXlX- = * @XX.h.e D T S.D n.m.b.$X$X$X$X$X%X%X&X&X4XqXoXOX*X8X8X*X<.hXvX; ; vXvXvXcXwX  ",

-"  nXbXzXzXlXlX- -XX.Y R.pXpXP J K.Z mXm.n.U.U.U.U.U.4X4XY.oXOX*X8X8X8X=X,.aXvX; > > > t t t cX  ",

-"  nXbXbXzXzXlXaXXXY +Xf = f = 7XtXR R   mXn.Y.[.[.[.[.OX*X*X8X5X*X=X,.u vXvX; > > MXMX, 7 t t   ",

-"  nXnXnXbXzXvX-.Y +XcX6 6 = = = d L B.G H `.X.:.7.m.=X=X=X=X=X6X,.u cXvXNX: BX> MXVXCXVX7 7 7   ",

-"  ZXZXnXbXAXgX@.+XvX; - - - - * @XR.>.sX>.R.i 0 x eXeXeXeXO hXaXcXvXNX: BXMXMXMXVXCXCXCXVX7 7   ",

-"  SXZXZXAXgXN.aXNX: : NXNXNX- * +X+X* 6 6 6 * * * * * * * vXvX- NX: DXBXMXMXFXCXCXCXCXGXVXVX7   ",

-"  SXSXHXgX0.JXKXLXKXKXDX: : NX* @X-X- - - - - - - - - - - NX: DXDXDXMXMXFXFXCXCXCXCXGXGXGXVXVX  ",

-"  SXHXPX3.JXnXnXnXnXbXLXKXKXNXaX-XvX: : NX: : : : : : : BXDXDXLXMXMXFXFXCXCXCXCXGXGXGXGXGXGXGX  ",

-"  IXUX$.AXZXZXZXZXnXnXnXLXLXNXJXvXBXDXBXBXBXBXDXDXDXDXLXDXLXLXFXFXFXFXCXCXCXCXGXGXGXGXGXGXGXGX  ",

-"                                                                                                "};


diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/$applicationClass$.java
deleted file mode 100644
index a62f4b6..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,46 +0,0 @@
-package $packageName$;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IApplication {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART)
-				return IApplication.EXIT_RESTART;
-			else
-				return IApplication.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		if (!PlatformUI.isWorkbenchRunning())
-			return;
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		final Display display = workbench.getDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				if (!display.isDisposed())
-					workbench.close();
-			}
-		});
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 91c7c98..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/helloRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index a9b323d..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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"; //$$NON-NLS-1$$
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 90d33ad..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,28 +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);
-%if productBranding == false
-        configurer.setTitle("$windowTitle$"); //$$NON-NLS-1$$
-%endif
-    }
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloRCP/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/helloWorldCmd/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloWorldCmd/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloWorldCmd/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloWorldCmd/java/$className$.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/helloWorldCmd/java/$className$.java
deleted file mode 100644
index 0009564..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/helloWorldCmd/java/$className$.java
+++ /dev/null

@@ -1,34 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Our sample handler extends AbstractHandler, an IHandler base class.
- * @see org.eclipse.core.commands.IHandler
- * @see org.eclipse.core.commands.AbstractHandler
- */
-public class $className$ extends AbstractHandler {
-	/**
-	 * The constructor.
-	 */
-	public $className$() {
-	}
-
-	/**
-	 * the command has been executed, so extract extract the needed information
-	 * from the application context.
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		MessageDialog.openInformation(
-				window.getShell(),
-				"$pluginName$",
-				"$message$");
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/link_obj.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/link_obj.gif
deleted file mode 100644
index a4b0788..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/link_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/titlebanner.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/titlebanner.gif
deleted file mode 100644
index 6737f76..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/content/titlebanner.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/concept1.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/concept1.xhtml
deleted file mode 100644
index 839c9f8..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/content/concept2.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/concept2.xhtml
deleted file mode 100644
index aab6830..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/content/concept3.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/concept3.xhtml
deleted file mode 100644
index c27f382..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/content/extContent.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/extContent.xhtml
deleted file mode 100644
index 80a9665..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/content/root.css b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/root.css
deleted file mode 100644
index 7cf89fc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/content/root.xhtml b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/root.xhtml
deleted file mode 100644
index 182f2cd..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/content/shared.css b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/content/shared.css
deleted file mode 100644
index 8a05736..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/ext.xml b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/ext.xml
deleted file mode 100644
index d08a22a..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/introContent.xml b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/introContent.xml
deleted file mode 100644
index c5dff2d..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/java/Application.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/Application.java
deleted file mode 100644
index 7c295fc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/Application.java
+++ /dev/null

@@ -1,45 +0,0 @@
-package $packageName$;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IApplication {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IApplication.EXIT_RESTART;
-			}
-			return IApplication.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		if (!PlatformUI.isWorkbenchRunning())
-			return;
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		final Display display = workbench.getDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				if (!display.isDisposed())
-					workbench.close();
-			}
-		});
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 475c67b..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index f29f957..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 65072fe..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/java/DynamicContentProvider.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/DynamicContentProvider.java
deleted file mode 100644
index d2b442a..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/intro/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/intro/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/mail/bin/icons/mail.ico b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/mail.ico
deleted file mode 100644
index b000061..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/mail.ico
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.icns b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.icns
deleted file mode 100644
index 1e92ccc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample.icns
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample2.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample2.gif
deleted file mode 100644
index 252d7eb..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample2.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample3.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample3.gif
deleted file mode 100644
index b949ac9..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/icons/sample3.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/product_lg.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/product_lg.gif
deleted file mode 100644
index bd95e28..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/bin/product_lg.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/$applicationClass$.java
deleted file mode 100644
index d5cc36c..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/$applicationClass$.java
+++ /dev/null

@@ -1,45 +0,0 @@
-package $packageName$;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IApplication {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IApplication.EXIT_RESTART;
-			}
-			return IApplication.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		if (!PlatformUI.isWorkbenchRunning())
-			return;
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		final Display display = workbench.getDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				if (!display.isDisposed())
-					workbench.close();
-			}
-		});
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 88d8b9c..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/mail/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 0aa813b..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,21 +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 {
-	
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-	public String getInitialWindowPerspectiveId() {
-		return Perspective.ID;
-	} 
-	
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 57183c0..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/mail/java/ICommandIds.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/ICommandIds.java
deleted file mode 100644
index dd6d40e..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/mail/java/MessagePopupAction.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/MessagePopupAction.java
deleted file mode 100644
index 8976bb4..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/mail/java/NavigationView.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/NavigationView.java
deleted file mode 100644
index aaae601..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/mail/java/OpenViewAction.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/OpenViewAction.java
deleted file mode 100644
index 7ea8882..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/mail/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/Perspective.java
deleted file mode 100644
index c65bbef..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/Perspective.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	/**
-	 * The ID of the perspective as specified in the extension.
-	 */
-	public static final String ID = "$pluginId$.perspective";
-
-	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/templates_3.3/mail/java/View.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/View.java
deleted file mode 100644
index 9b87452..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/mail/java/View.java
+++ /dev/null

@@ -1,83 +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";
-
-	/**
-	 * The text control that's displaying the content of the email message.
-	 */
-	private Text messageText;
-	
-	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
-		messageText = new Text(top, SWT.MULTI | SWT.WRAP);
-		messageText.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");
-		messageText.setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	public void setFocus() {
-		messageText.setFocus();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/af.png b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/af.png
deleted file mode 100644
index bcd0ce8..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/af.png
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/embedded.png b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/embedded.png
deleted file mode 100644
index 57edc6a..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/embedded.png
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/enterprise.png b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/enterprise.png
deleted file mode 100644
index 7fe2f5c..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/enterprise.png
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/languages.png b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/languages.png
deleted file mode 100644
index 98af2da..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/languages.png
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/rcp.png b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/rcp.png
deleted file mode 100644
index b248ca2..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/bin/icons/rcp.png
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/BrowserSplashHandler.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/BrowserSplashHandler.java
deleted file mode 100644
index dceb0fc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/BrowserSplashHandler.java
+++ /dev/null

@@ -1,177 +0,0 @@
-
-package $packageName$;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.ProgressEvent;
-import org.eclipse.swt.browser.ProgressListener;
-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.Shell;
-import org.eclipse.ui.splash.AbstractSplashHandler;
-
-/**
- * @since 3.3
- * 
- */
-public class BrowserSplashHandler extends AbstractSplashHandler {
-
-	private final static String F_BROWSER_URL = "http://www.google.com"; //$NON-NLS-1$
-	
-	private Browser fBrowser;
-	
-	private Button fButton;
-	
-	private boolean fClose;
-
-	/**
-	 * 
-	 */
-	public BrowserSplashHandler() {
-		fBrowser = null;
-		fButton = null;
-		fClose = false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.internal.splash.AbstractSplashHandler#init(org.eclipse.swt.widgets.Shell,
-	 *      org.eclipse.ui.IWorkbench)
-	 */
-	public void init(final Shell splash) {
-		// Store the shell
-		super.init(splash);
-		// Configure the shell layout
-		configureUISplash();
-		// Create UI
-		createUI();
-		// Create UI listeners
-		createUIListeners();
-		// Force the UI to layout
-		splash.layout(true);
-		// Keep the splash screen visible and prevent the RCP application from 
-		// loading until the close button is clicked.
-		doEventLoop();
-	}
-	
-	/**
-	 * 
-	 */
-	private void doEventLoop() {
-		Shell splash = getSplash();
-		while (fClose == false) {
-			if (splash.getDisplay().readAndDispatch() == false) {
-				splash.getDisplay().sleep();
-			}
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	private void createUIListeners() {
-		// Create the browser listeners
-		createUIListenersBrowser();
-		// Create the button listeners
-		createUIListenersButton();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersButton() {
-		fButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// NO-OP
-			}
-			public void widgetSelected(SelectionEvent e) {
-				fClose = true;
-			}
-		});		
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersBrowser() {
-		fBrowser.addProgressListener(new ProgressListener() {
-			public void changed(ProgressEvent event) {
-				// NO-OP
-			}
-			public void completed(ProgressEvent event) {
-				// Only show the UI when the URL is fully loaded into the 
-				// browser
-				fBrowser.setVisible(true);
-				fButton.setVisible(true);
-			}
-		});		
-	}
-	
-	/**
-	 * 
-	 */
-	private void createUI() {
-		// Create the web browser
-		createUIBrowser();
-		// Create the close button
-		createUIButton();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIButton() {
-		Shell splash = getSplash();
-		fButton = new Button(splash, SWT.PUSH);
-		fButton.setText("Close"); //$NON-NLS-1$
-		fButton.setVisible(false);
-		// Configure the button bounds
-		configureUIButtonBounds();		
-		// Configure layout data
-		GridData data = new GridData(SWT.CENTER, SWT.FILL, false, false);
-		data.widthHint = 80;			
-		fButton.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void configureUIButtonBounds() {
-		Shell splash = getSplash();
-		
-		int button_x_coord = (splash.getSize().x / 2)
-				- (fButton.computeSize(SWT.DEFAULT, SWT.DEFAULT).x / 2);
-		int button_y_coord = splash.getSize().y
-				- fButton.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
-		int button_x_width = splash.getSize().x;
-		int button_y_width = fButton.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
-		
-		fButton.setBounds(button_x_coord, button_y_coord, button_x_width,
-				button_y_width);		
-	}	
-	
-	/**
-	 * 
-	 */
-	private void createUIBrowser() {
-		fBrowser = new Browser(getSplash(), SWT.NONE);
-		fBrowser.setUrl(F_BROWSER_URL);
-		fBrowser.setVisible(false);
-		// Configure layout data
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		fBrowser.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void configureUISplash() {
-		GridLayout layout = new GridLayout(1, true);
-		getSplash().setLayout(layout);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/ExtensibleSplashHandler.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/ExtensibleSplashHandler.java
deleted file mode 100644
index 23e3ef3..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/ExtensibleSplashHandler.java
+++ /dev/null

@@ -1,308 +0,0 @@
-
-package $packageName$;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.splash.AbstractSplashHandler;
-
-/**
- * @since 3.3
- *
- */
-public class ExtensibleSplashHandler extends AbstractSplashHandler {
-	
-	private ArrayList fImageList;
-	
-	private ArrayList fTooltipList;
-
-	private final static String F_SPLASH_EXTENSION_ID = "$pluginId$.splashExtension"; //$NON-NLS-1$
-	
-	private final static String F_ELEMENT_ICON = "icon"; //$NON-NLS-1$
-	
-	private final static String F_ELEMENT_TOOLTIP = "tooltip"; //$NON-NLS-1$
-	
-	private final static String F_DEFAULT_TOOLTIP = "Image"; //$NON-NLS-1$
-	
-	private final static int F_IMAGE_WIDTH = 50;
-	
-	private final static int F_IMAGE_HEIGHT = 50;
-	
-	private final static int F_SPLASH_SCREEN_BEVEL = 5;
-	
-	private Composite fIconPanel;
-	
-	/**
-	 * 
-	 */
-	public ExtensibleSplashHandler() {
-		fImageList = new ArrayList();
-		fTooltipList = new ArrayList();
-		fIconPanel = null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.splash.AbstractSplashHandler#init(org.eclipse.swt.widgets.Shell)
-	 */
-	public void init(Shell splash) {
-		// Store the shell
-		super.init(splash);
-		// Configure the shell layout
-		configureUISplash();
-		// Load all splash extensions
-		loadSplashExtensions();
-		// If no splash extensions were loaded abort the splash handler
-		if (hasSplashExtensions() == false) {
-			return;
-		}
-		// Create UI
-		createUI();
-		// Configure the image panel bounds
-		configureUICompositeIconPanelBounds();
-		// Enter event loop and prevent the RCP application from 
-		// loading until all work is done
-		doEventLoop();
-	}
-
-	/**
-	 * @return
-	 */
-	private boolean hasSplashExtensions() {
-		if (fImageList.isEmpty()) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	private void createUI() {
-		// Create the icon panel
-		createUICompositeIconPanel();
-		// Create the images
-		createUIImages();
-	}	
-	
-	/**
-	 * 
-	 */
-	private void createUIImages() {
-		Iterator imageIterator = fImageList.iterator();
-		Iterator tooltipIterator = fTooltipList.iterator();
-		int i = 1;
-		int columnCount = ((GridLayout)fIconPanel.getLayout()).numColumns;
-		// Create all the images 
-		// Abort if we run out of columns (left-over images will not fit within
-		// the usable splash screen width)
-		while (imageIterator.hasNext() && 
-				(i <= columnCount)) {
-			Image image = (Image)imageIterator.next();
-			String tooltip = (String)tooltipIterator.next();
-			// Create the image using a label widget
-			createUILabel(image, tooltip);
-			i++;
-		}
-	}
-	
-	/**
-	 * @param image
-	 * @param tooltip
-	 */
-	private void createUILabel(Image image, String tooltip) {
-		// Create the label (no text)
-		Label label = new Label(fIconPanel, SWT.NONE);
-		label.setImage(image);
-		label.setToolTipText(tooltip);		
-	}
-
-	/**
-	 * 
-	 */
-	private void createUICompositeIconPanel() {
-		Shell splash = getSplash();
-		// Create the composite
-		fIconPanel = new Composite(splash, SWT.NONE);
-		// Determine the maximum number of columns that can fit on the splash
-		// screen.  One 50x50 image per column.
-		int maxColumnCount = getUsableSplashScreenWidth() / F_IMAGE_WIDTH;
-		// Limit size to the maximum number of columns if the number of images
-		// exceed this amount; otherwise, use the exact number of columns 
-		// required.
-		int actualColumnCount = Math.min(fImageList.size(), maxColumnCount);
-		// Configure the layout
-		GridLayout layout = new GridLayout(actualColumnCount, true);
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		fIconPanel.setLayout(layout);
-	}
-
-	/**
-	 * 
-	 */
-	private void configureUICompositeIconPanelBounds() {
-		// Determine the size of the panel and position it at the bottom-right
-		// of the splash screen.
-		Point panelSize = fIconPanel.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
-		
-		int x_coord = getSplash().getSize().x - F_SPLASH_SCREEN_BEVEL - panelSize.x;
-		int y_coord = getSplash().getSize().y - F_SPLASH_SCREEN_BEVEL - panelSize.y; 
-		int x_width = panelSize.x;
-		int y_width = panelSize.y;
-		
-		fIconPanel.setBounds(x_coord, y_coord, x_width, y_width);	
-	}
-	
-	/**
-	 * @return
-	 */
-	private int getUsableSplashScreenWidth() {
-		// Splash screen width minus two graphic border bevel widths
-		return getSplash().getSize().x - (F_SPLASH_SCREEN_BEVEL * 2);
-	}
-	
-	/**
-	 * 
-	 */
-	private void loadSplashExtensions() {
-		// Get all splash handler extensions
-		IExtension[] extensions = 
-			Platform.getExtensionRegistry().getExtensionPoint(
-					F_SPLASH_EXTENSION_ID).getExtensions();
-		// Process all splash handler extensions
-		for (int i = 0; i < extensions.length; i++) {
-			processSplashExtension(extensions[i]);
-		}
-	}
-
-	/**
-	 * @param extension
-	 */
-	private void processSplashExtension(IExtension extension) {
-		// Get all splash handler configuration elements
-		IConfigurationElement[] elements = extension.getConfigurationElements();
-		// Process all splash handler configuration elements
-		for (int j = 0; j < elements.length; j++) {
-			processSplashElements(elements[j]);
-		}
-	}
-
-	/**
-	 * @param configurationElement
-	 */
-	private void processSplashElements(
-			IConfigurationElement configurationElement) {
-		// Attribute: icon
-		processSplashElementIcon(configurationElement);
-		// Attribute: tooltip
-		processSplashElementTooltip(configurationElement);
-	}
-
-	/**
-	 * @param configurationElement
-	 */
-	private void processSplashElementTooltip(
-			IConfigurationElement configurationElement) {
-		// Get attribute tooltip
-		String tooltip = configurationElement.getAttribute(F_ELEMENT_TOOLTIP);
-		// If a tooltip is not defined, give it a default
-		if ((tooltip == null) || 
-				(tooltip.length() == 0)) {
-			fTooltipList.add(F_DEFAULT_TOOLTIP);
-		} else {
-			fTooltipList.add(tooltip);
-		}
-	}
-
-	/**
-	 * @param configurationElement
-	 */
-	private void processSplashElementIcon(
-			IConfigurationElement configurationElement) {
-		// Get attribute icon
-		String iconImageFilePath = configurationElement.getAttribute(F_ELEMENT_ICON);
-		// Abort if an icon attribute was not specified
-		if ((iconImageFilePath == null) ||
-				(iconImageFilePath.length() == 0)) {
-			return;
-		}
-		// Create a corresponding image descriptor
-		ImageDescriptor descriptor = 
-			AbstractUIPlugin.imageDescriptorFromPlugin(
-					configurationElement.getNamespaceIdentifier(), 
-					iconImageFilePath);
-		// Abort if no corresponding image was found
-		if (descriptor == null) {
-			return;
-		}
-		// Create the image
-		Image image = descriptor.createImage();
-		// Abort if image creation failed
-		if (image == null) {
-			return;
-		}
-		// Abort if the image does not have dimensions of 50x50
-		if ((image.getBounds().width != F_IMAGE_WIDTH) || 
-				(image.getBounds().height != F_IMAGE_HEIGHT)) {
-			// Dipose of the image
-			image.dispose();
-			return;
-		}
-		// Store the image and tooltip
-		fImageList.add(image);
-	}
-
-	/**
-	 * 
-	 */
-	private void configureUISplash() {
-		// Configure layout
-		GridLayout layout = new GridLayout(1, true);
-		getSplash().setLayout(layout);
-		// Force shell to inherit the splash background
-		getSplash().setBackgroundMode(SWT.INHERIT_DEFAULT);		
-	}	
-	
-	/**
-	 * 
-	 */
-	private void doEventLoop() {
-		Shell splash = getSplash();
-		if (splash.getDisplay().readAndDispatch() == false) {
-			splash.getDisplay().sleep();
-		}
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.splash.AbstractSplashHandler#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		// Check to see if any images were defined
-		if ((fImageList == null) ||
-				fImageList.isEmpty()) {
-			return;
-		}
-		// Dispose of all the images
-		Iterator iterator = fImageList.iterator();
-		while (iterator.hasNext()) {
-			Image image = (Image) iterator.next();
-			image.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/InteractiveSplashHandler.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/InteractiveSplashHandler.java
deleted file mode 100644
index e6c5a0f..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/java/InteractiveSplashHandler.java
+++ /dev/null

@@ -1,293 +0,0 @@
-
-package $packageName$;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-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.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.splash.AbstractSplashHandler;
-
-/**
- * @since 3.3
- * 
- */
-public class InteractiveSplashHandler extends AbstractSplashHandler {
-	
-	private final static int F_LABEL_HORIZONTAL_INDENT = 175;
-
-	private final static int F_BUTTON_WIDTH_HINT = 80;
-
-	private final static int F_TEXT_WIDTH_HINT = 175;
-	
-	private final static int F_COLUMN_COUNT = 3;
-	
-	private Composite fCompositeLogin;
-	
-	private Text fTextUsername;
-	
-	private Text fTextPassword;
-	
-	private Button fButtonOK;
-	
-	private Button fButtonCancel;
-	
-	private boolean fAuthenticated;
-	
-	/**
-	 * 
-	 */
-	public InteractiveSplashHandler() {
-		fCompositeLogin = null;
-		fTextUsername = null;
-		fTextPassword = null;
-		fButtonOK = null;
-		fButtonCancel = null;
-		fAuthenticated = false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.splash.AbstractSplashHandler#init(org.eclipse.swt.widgets.Shell)
-	 */
-	public void init(final Shell splash) {
-		// Store the shell
-		super.init(splash);
-		// Configure the shell layout
-		configureUISplash();
-		// Create UI
-		createUI();		
-		// Create UI listeners
-		createUIListeners();
-		// Force the splash screen to layout
-		splash.layout(true);
-		// Keep the splash screen visible and prevent the RCP application from 
-		// loading until the close button is clicked.
-		doEventLoop();
-	}
-	
-	/**
-	 * 
-	 */
-	private void doEventLoop() {
-		Shell splash = getSplash();
-		while (fAuthenticated == false) {
-			if (splash.getDisplay().readAndDispatch() == false) {
-				splash.getDisplay().sleep();
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListeners() {
-		// Create the OK button listeners
-		createUIListenersButtonOK();
-		// Create the cancel button listeners
-		createUIListenersButtonCancel();
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIListenersButtonCancel() {
-		fButtonCancel.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleButtonCancelWidgetSelected();
-			}
-		});		
-	}
-
-	/**
-	 * 
-	 */
-	private void handleButtonCancelWidgetSelected() {
-		// Abort the loading of the RCP application
-		getSplash().getDisplay().close();
-		System.exit(0);		
-	}
-	
-	/**
-	 * 
-	 */
-	private void createUIListenersButtonOK() {
-		fButtonOK.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleButtonOKWidgetSelected();
-			}
-		});				
-	}
-
-	/**
-	 * 
-	 */
-	private void handleButtonOKWidgetSelected() {
-		String username = fTextUsername.getText();
-		String password = fTextPassword.getText();
-		// Aunthentication is successful if a user provides any username and
-		// any password
-		if ((username.length() > 0) &&
-				(password.length() > 0)) {
-			fAuthenticated = true;
-		} else {
-			MessageDialog.openError(
-					getSplash(),
-					"Authentication Failed",  //$$NON-NLS-1$$
-					"A username and password must be specified to login.");  //$$NON-NLS-1$$
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	private void createUI() {
-		// Create the login panel
-		createUICompositeLogin();
-		// Create the blank spanner
-		createUICompositeBlank();
-		// Create the user name label
-		createUILabelUserName();
-		// Create the user name text widget
-		createUITextUserName();
-		// Create the password label
-		createUILabelPassword();
-		// Create the password text widget
-		createUITextPassword();
-		// Create the blank label
-		createUILabelBlank();
-		// Create the OK button
-		createUIButtonOK();
-		// Create the cancel button
-		createUIButtonCancel();
-	}		
-	
-	/**
-	 * 
-	 */
-	private void createUIButtonCancel() {
-		// Create the button
-		fButtonCancel = new Button(fCompositeLogin, SWT.PUSH);
-		fButtonCancel.setText("Cancel"); //$$NON-NLS-1$$
-		// Configure layout data
-		GridData data = new GridData(SWT.NONE, SWT.NONE, false, false);
-		data.widthHint = F_BUTTON_WIDTH_HINT;	
-		data.verticalIndent = 10;
-		fButtonCancel.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUIButtonOK() {
-		// Create the button
-		fButtonOK = new Button(fCompositeLogin, SWT.PUSH);
-		fButtonOK.setText("OK"); //$$NON-NLS-1$$
-		// Configure layout data
-		GridData data = new GridData(SWT.NONE, SWT.NONE, false, false);
-		data.widthHint = F_BUTTON_WIDTH_HINT;
-		data.verticalIndent = 10;
-		fButtonOK.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUILabelBlank() {
-		Label label = new Label(fCompositeLogin, SWT.NONE);
-		label.setVisible(false);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUITextPassword() {
-		// Create the text widget
-		int style = SWT.PASSWORD | SWT.BORDER;
-		fTextPassword = new Text(fCompositeLogin, style);
-		// Configure layout data
-		GridData data = new GridData(SWT.NONE, SWT.NONE, false, false);
-		data.widthHint = F_TEXT_WIDTH_HINT;
-		data.horizontalSpan = 2;
-		fTextPassword.setLayoutData(data);		
-	}
-
-	/**
-	 * 
-	 */
-	private void createUILabelPassword() {
-		// Create the label
-		Label label = new Label(fCompositeLogin, SWT.NONE);
-		label.setText("&Password:"); //$$NON-NLS-1$$
-		// Configure layout data
-		GridData data = new GridData();
-		data.horizontalIndent = F_LABEL_HORIZONTAL_INDENT;
-		label.setLayoutData(data);					
-	}
-
-	/**
-	 * 
-	 */
-	private void createUITextUserName() {
-		// Create the text widget
-		fTextUsername = new Text(fCompositeLogin, SWT.BORDER);
-		// Configure layout data
-		GridData data = new GridData(SWT.NONE, SWT.NONE, false, false);
-		data.widthHint = F_TEXT_WIDTH_HINT;
-		data.horizontalSpan = 2;
-		fTextUsername.setLayoutData(data);		
-	}
-
-	/**
-	 * 
-	 */
-	private void createUILabelUserName() {
-		// Create the label
-		Label label = new Label(fCompositeLogin, SWT.NONE);
-		label.setText("&User Name:"); //$$NON-NLS-1$$
-		// Configure layout data
-		GridData data = new GridData();
-		data.horizontalIndent = F_LABEL_HORIZONTAL_INDENT;
-		label.setLayoutData(data);		
-	}
-
-	/**
-	 * 
-	 */
-	private void createUICompositeBlank() {
-		Composite spanner = new Composite(fCompositeLogin, SWT.NONE);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		data.horizontalSpan = F_COLUMN_COUNT;
-		spanner.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void createUICompositeLogin() {
-		// Create the composite
-		fCompositeLogin = new Composite(getSplash(), SWT.BORDER);
-		GridLayout layout = new GridLayout(F_COLUMN_COUNT, false);
-		fCompositeLogin.setLayout(layout);		
-	}
-
-	/**
-	 * 
-	 */
-	private void configureUISplash() {
-		// Configure layout
-		FillLayout layout = new FillLayout(); 
-		getSplash().setLayout(layout);
-		// Force shell to inherit the splash background
-		getSplash().setBackgroundMode(SWT.INHERIT_DEFAULT);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/schema/splashExtension.exsd b/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/schema/splashExtension.exsd
deleted file mode 100644
index 9a55f84..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/splashHandlers/schema/splashExtension.exsd
+++ /dev/null

@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="$pluginId$">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="$pluginId$" id="splashExtension" name="Splash Extensions"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="splashExtension"/>
-         </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="splashExtension">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="id" icon="icon"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string" use="required">
-            <annotation>
-               <documentation>
-                  50x50 icon
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="tooltip" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_16.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_16.gif
deleted file mode 100644
index 05626b1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_16.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_32.gif b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_32.gif
deleted file mode 100644
index b432f88..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/bin/icons/alt_window_32.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/$applicationClass$.java
deleted file mode 100644
index d5cc36c..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,45 +0,0 @@
-package $packageName$;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IApplication {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	public Object start(IApplicationContext context) {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IApplication.EXIT_RESTART;
-			}
-			return IApplication.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	public void stop() {
-		if (!PlatformUI.isWorkbenchRunning())
-			return;
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		final Display display = workbench.getDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				if (!display.isDisposed())
-					workbench.close();
-			}
-		});
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 706da75..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationActionBarAdvisor.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package $packageName$;
-
-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.
-
-	public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-		super(configurer);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index ac5e997..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/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/templates_3.3/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 683fadc..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,29 +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);
-%if productBranding == false		
-		configurer.setTitle("$windowTitle$");
-%endif
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/Perspective.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/Perspective.java
deleted file mode 100644
index 03a4c97..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/Perspective.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-		layout.setEditorAreaVisible(false);
-		layout.setFixed(true);
-		
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/View.java b/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/View.java
deleted file mode 100644
index 56e68a1..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.3/viewRCP/java/View.java
+++ /dev/null

@@ -1,77 +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) {
-			if (parent instanceof Object[]) {
-				return (Object[]) parent;
-			}
-	        return new Object[0];
-		}
-	}
-
-	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());
-		// Provide the input to the ContentProvider
-		viewer.setInput(new String[] {"One", "Two", "Three"});
-	}
-
-	/**
-	 * 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/templates_3.5/OSGiEventAdmin/OSGI-INF/component.xml b/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/OSGI-INF/component.xml
deleted file mode 100755
index d5c3768..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/OSGI-INF/component.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="$packageName$">
-   <implementation class="$packageName$.ServiceComponent"/>
-   <service>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-   <property name="event.topics" type="String" value="$eventTopic$"/>
-</scr:component>

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/build.properties b/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/build.properties
deleted file mode 100755
index c58ea21..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/java/ServiceComponent.java b/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/java/ServiceComponent.java
deleted file mode 100755
index e70beed..0000000
--- a/ui/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/java/ServiceComponent.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package $packageName$;
-
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventHandler;
-
-// referenced in component.xml
-public class ServiceComponent implements EventHandler {
-
-	public void handleEvent(Event event) {
-		// TODO handle event - $eventTopic$
-		System.out.println(event.getTopic());
-	}
-	
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde/.classpath b/ui/org.eclipse.pde/.classpath
deleted file mode 100644
index 70d85d6..0000000
--- a/ui/org.eclipse.pde/.classpath
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-</classpath>

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

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

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/ui/org.eclipse.pde/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1a4cdbd..0000000
--- a/ui/org.eclipse.pde/.settings/org.eclipse.core.resources.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Fri Oct 20 13:22:13 EDT 2006
-eclipse.preferences.version=1
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/default.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/implied.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/osname.aliases=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases=UTF-8
-encoding/<project>=ISO-8859-1

diff --git a/ui/org.eclipse.pde/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c0cb5a6..0000000
--- a/ui/org.eclipse.pde/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,350 +0,0 @@
-#Fri Oct 03 17:34:09 CDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-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=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/ui/org.eclipse.pde/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 50b778b..0000000
--- a/ui/org.eclipse.pde/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Sun Dec 30 18:01:47 CST 2007
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.overrideannotation=false
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ui/org.eclipse.pde/.settings/org.eclipse.pde.core.prefs b/ui/org.eclipse.pde/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 93ecf03..0000000
--- a/ui/org.eclipse.pde/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Tue Apr 12 17:45:52 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.pde/binary

diff --git a/ui/org.eclipse.pde/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 8d3361f..0000000
--- a/ui/org.eclipse.pde/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,16 +0,0 @@
-#Sun Dec 23 21:53:15 CST 2007
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-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/META-INF/MANIFEST.MF b/ui/org.eclipse.pde/META-INF/MANIFEST.MF
deleted file mode 100644
index acd33b3..0000000
--- a/ui/org.eclipse.pde/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde; singleton:=true
-Bundle-Version: 3.6.100.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4

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

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde/about.ini b/ui/org.eclipse.pde/about.ini
deleted file mode 100644
index e1af9b8..0000000
--- a/ui/org.eclipse.pde/about.ini
+++ /dev/null

@@ -1,32 +0,0 @@
-# about.ini

-# contains information about a feature

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# "%key" are externalized strings defined in about.properties

-# This file does not need to be translated.

-

-# Property "aboutText" contains blurb for "About" dialog (translated)

-aboutText=%blurb

-

-# Property "windowImage" contains path to window icon (16x16)

-# needed for primary features only

-

-# Property "featureImage" contains path to feature image (32x32)

-featureImage=eclipse32.png

-

-# Property "aboutImage" contains path to product image (500x330 or 115x164)

-# needed for primary features only

-

-# Property "appName" contains name of the application (translated)

-# needed for primary features only

-

-# Property "welcomePage" contains path to welcome page (special XML-based format)

-welcomePage=$nl$/welcome.xml

-

-# Property "welcomePerspective" contains the id of the perspective in which the

-# welcome page is to be opened.

-# optional

-

-# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 

-# optional

-tipsAndTricksHref=/org.eclipse.pde.doc.user/tips/pde_tips.htm

-


diff --git a/ui/org.eclipse.pde/about.mappings b/ui/org.eclipse.pde/about.mappings
deleted file mode 100644
index 720ca87..0000000
--- a/ui/org.eclipse.pde/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@
\ No newline at end of file

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

@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Eclipse Plug-in Development Environment\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2000, 2010.  All rights reserved.\n\
-Visit http://www.eclipse.org/pde
-

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

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

diff --git a/ui/org.eclipse.pde/cheatsheets/helloworld-composite.xml b/ui/org.eclipse.pde/cheatsheets/helloworld-composite.xml
deleted file mode 100644
index 69c8120..0000000
--- a/ui/org.eclipse.pde/cheatsheets/helloworld-composite.xml
+++ /dev/null

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Composite Cheat Sheet -->
-
-<compositeCheatsheet name="Creating an Eclipse plug-in">
-
-   <!-- Task Group -->
-
-   <taskGroup kind="set" name="Create an Eclipse plug-in">
-      <intro>
-         This cheat sheet will guide you through the individual steps to 
-         create a plug-in, a plug-in extension, a feature and an update site
-         using the Plug-in Development Environment (PDE).  It will also
-         demonstrate how to install and uninstall a feature using
-         Install/Update.
-         <br/>
-         <br/>
-         To assist you along the way, wizards and commands
-         will be available for you to launch automatically.
-      </intro>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Create a plug-in">
-         <intro>
-            This cheat sheet will demonstrate how to  
-            create, modify and test a plug-in. 
-         </intro>
-         <param name="path" value="helloworld/helloworld-create.xml" />
-         <onCompletion>
-         	Congratulations!  You just created a plug-in!
-         </onCompletion>
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Create a plug-in extension">
-         <intro>
-            This cheat sheet will demonstrate how to create and test a plug-in extension. 
-         </intro>
-         <param name="path" value="helloworld/helloworld-extension.xml" />
-         <onCompletion>
-         	Congratulations!  You just created a plug-in extension!
-         </onCompletion>         
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Create a feature">
-         <intro>
-            This cheat sheet will demonstrate how to create a feature for a plug-in using
-            PDE.
-         </intro>
-         <param name="path" value="helloworld/helloworld-feature.xml" />
-         <onCompletion>
-         	Congratulations!  You just created a feature!
-         </onCompletion>  
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Create an update site">
-         <intro>
-            This cheat sheet will demonstrate how to create an update site for a plug-in.
-         </intro>
-         <param name="path" value="helloworld/helloworld-update.xml" />
-         <onCompletion>
-         	Congratulations!  You just created an update site!
-         </onCompletion>  
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Install and uninstall a feature">
-         <intro>
-            This cheat sheet will demonstrate how to install and uninstall a feature
-            using Install/Update.
-         </intro>
-         <param name="path" value="helloworld/helloworld-install.xml" />
-         <onCompletion>
-         	Congratulations!  You just installed and uninstalled a feature!
-         </onCompletion>  
-      </task>
-
-      <onCompletion>
-         Congratulations!  You just created a plug-in, a plug-in extension, a 
-         feature and an update site using PDE.  You also installed and 
-         uninstalled a feature using Install/Update
-      </onCompletion>
-
-   </taskGroup>
-
-
-</compositeCheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-create.xml b/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-create.xml
deleted file mode 100644
index 2acec7f..0000000
--- a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-create.xml
+++ /dev/null

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-     Copyright (c) 2005, 2009 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<cheatsheet title="Create a plug-in">
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to configure PDE and use it 
-         to create, modify and test a plug-in. 
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?).
-      </description>
-   </intro>
-   <item title="Configure PDE" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm">
-      <description>
-         To configure PDE, perform the following steps
-      </description>
-      <subitem label="Select &quot;Window-&gt;Open Perspective-&gt;Other...&quot; from the main menu and choose &quot;Plug-in Development&quot; in order to open the plug-in development perspective" skip="false">
-         <command
-               confirm="false"
-               required="false"
-               translate=""
-               serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)">
-         </command>
-      </subitem>
-      <subitem label="Select &quot;Window-&gt;Preferences&quot; from the main menu, expand the &quot;Plug-in Development&quot; outline tree node within the resulting dialog, and choose &quot;Target Platform&quot;." skip="false">
-         <command
-               confirm="false"
-               required="false"
-               translate=""
-               serialization="org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.pde.ui.TargetPlatformPreferencePage)">
-         </command>
-      </subitem>
-      <subitem label="Verify that the &quot;Target Definitions:&quot; check box list has one Target Platform selected as active." skip="true">
-      </subitem>
-      <subitem label="Select the Active Target Platform, Click Edit and verify that all checkboxes corresponding to plug-in entries listed in the list box on the &quot;Content&quot; tab are checked." skip="true">
-      </subitem>
-      <subitem label="Click &quot;OK&quot;." skip="false">
-      </subitem>
-   </item>
-   <item title="Create the plug-in" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/project_wizards/new_plugin_project.htm">
-      <description>
-         To create the plug-in perform the following steps
-      </description>
-      <subitem label="Select &quot;File-&gt;New-&gt;Project...&quot; from the main menu, expand the &quot;Plug-in Development&quot; category within the resulting &quot;New Project&quot; dialog box, and choose &quot;Plug-in Project&quot;" skip="false">
-         <command
-               confirm="false"
-               required="false"
-               translate=""
-               serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.pde.ui.NewProjectWizard)">
-         </command>
-      </subitem>
-      <subitem label="Input &quot;com.example.helloworld&quot; into the &quot;Project Name&quot; text box" skip="false">
-      </subitem>
-      <subitem label="Accept the rest of the default preloaded values on the &quot;Plug-in Project&quot; page and click &quot;Next &gt;&quot;" skip="false">
-      </subitem>
-      <subitem label="Accept the default preloaded values on the &quot;Content&quot; page. Verify that  &quot;Rich Client Applications&quot; section marks No. Click &quot;Next &gt;&quot;" skip="false">
-      </subitem>
-      <subitem label="Select the &quot;Hello, World&quot; template from the list of &quot;Available Templates&quot; and click &quot;Finish&quot;" skip="false">
-      </subitem>
-   </item>
-   <item title="Modify the plug-in" dialog="false" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/editors/manifest_editor/extensions.htm">
-      <description>
-         After the new plug-in project wizard is finished from the previous step,
-         the plug-in editor is launched for your new project with the <b>Overview</b>
-         page showing.
-         <br/>
-         <br/>
-         To modify your <b>com.example.helloworld</b> plug-in, perform the
-         following steps:
-      </description>
-      <subitem label="Select the &quot;Extensions&quot; tab" skip="false">
-      </subitem>
-      <subitem label="Expand the &quot;org.eclipse.ui.actionSets&quot; tree dialog under the &quot;All Extensions&quot; heading" skip="false">
-      </subitem>
-      <subitem label="Expand the &quot;Sample Action Set&quot; tree dialog" skip="false">
-      </subitem>
-      <subitem label="Select the &quot;Sample Menu&quot; entry" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;label&quot; text box under the &quot;Extension Element Details&quot; heading with &quot;Hello Menu&quot;" skip="false">
-      </subitem>
-      <subitem label="Select the &quot;Sample Action&quot; entry under the &quot;All Extensions&quot; heading" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;label&quot; text box under the &quot;Extension Element Details&quot; heading with &quot;Display Hello World&quot;" skip="false">
-      </subitem>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" skip="false">
-      </subitem>
-   </item>
-   <item title="Test the plug-in" dialog="false" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/launchers/eclipse_application_launcher.htm">
-      <description>
-         To test your Eclipse plug-in inside a target Eclipse platform,
-         perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Overview&quot; tab" skip="false">
-         <command
-               confirm="false"
-               required="false"
-               translate=""
-               serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.helloworld/META-INF/MANIFEST.MF)">
-         </command>
-      </subitem>
-      <subitem label="Click the &quot;Launch an Eclipse application&quot; hyperlink under the &quot;Testing&quot; heading." skip="false">
-      </subitem>
-      <subitem label="Note the &quot;Hello Menu&quot; entry in the main menu in the newly launched Eclipse platform." skip="true">
-      </subitem>
-      <subitem label="Select &quot;Hello Menu-&gt;Display Hello World&quot; from the main menu." skip="false">
-      </subitem>
-      <subitem label="Verify that a dialog box is displayed with the title &quot;Helloworld&quot; and message as &quot;Hello, Eclipse world&quot;. Click &quot;OK&quot; to close it." skip="false">
-      </subitem>
-      <subitem label="Click on the &quot;Workbench&quot;  icon to close the &quot;Welcome&quot; view and go to the Eclipse workbench." skip="true">
-      </subitem>
-      <subitem label="Note the icon with the Eclipse logo in the main toolbar in the newly launched Eclipse platform." skip="true">
-      </subitem>
-      <subitem label="Click the icon with the Eclipse logo in the main toolbar." skip="false">
-      </subitem>
-      <subitem label="Verify that a dialog box is displayed with the title &quot;Helloworld&quot; and message as &quot;Hello, Eclipse world&quot;. Click &quot;OK&quot; to close it." skip="false">
-      </subitem>      
-      <subitem label="Select &quot;File-&gt;Exit&quot; from the main menu to exit the target Eclipse platform" skip="false">
-      </subitem>
-   </item>
-</cheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-extension.xml b/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-extension.xml
deleted file mode 100644
index b6bf8e4..0000000
--- a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-extension.xml
+++ /dev/null

@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<cheatsheet title="Create a plug-in extension">
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to create and test a plug-in extension
-         using PDE. 
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?).
-      </description>
-   </intro>
-   <item title="Open the plug-in development perspective" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command
-            confirm="false"
-            required="false"
-            translate=""
-            serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)">
-      </command>
-   </item>
-   <item title="Open the plug-in editor" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/editors/manifest_editor/editor.htm">
-      <description>
-         To open the plug-in editor (if it is not already open),
-         expand the <b>com.example.helloworld</b> tree dialog
-         in the <b>Package Explorer</b> view and double-click
-         on the <b>plugin.xml</b> file.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command
-            confirm="false"
-            required="false"
-            translate=""
-            serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.helloworld/plugin.xml)">
-      </command>
-   </item>
-   <item title="Define a view extension" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/editors/manifest_editor/extensions.htm">
-      <description>
-         To define a view extension, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Extensions&quot; tab within the plug-in editor to display the &quot;Extensions&quot; page" skip="false">
-      </subitem>
-      <subitem label="Click the &quot;Add&quot; button to open the &quot;New Extension&quot; wizard" skip="false">
-      </subitem>
-      <subitem label="Select &quot;org.eclipse.ui.views&quot; from the &quot;Extension Points&quot; list box and click &quot;Finish&quot;" skip="false">
-      </subitem>
-   </item>
-   <item title="Add a view category" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/editors/manifest_editor/extensions.htm">
-      <description>
-         To define a view category, perform the following steps:
-      </description>
-      <subitem label="Select &quot;org.eclipse.ui.views&quot; in the list box under &quot;All Extensions&quot; heading in the &quot;Extensions&quot; page" skip="false">
-      </subitem>
-      <subitem label="Right-click and select &quot;New-&gt;category&quot; from the context menu" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;id&quot; text box under &quot;Extension Element Details&quot; with &quot;com.example.helloworld.view.helloworldcategory&quot;" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;name&quot; text box with &quot;Hello World!&quot;" skip="false">
-      </subitem>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" skip="false">
-      </subitem>
-   </item>
-   <item title="Add a view" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/editors/manifest_editor/extensions.htm">
-      <description>
-         To define a view, perform the following steps:
-      </description>
-      <subitem label="Select &quot;org.eclipse.ui.views&quot; in the list box under &quot;All Extensions&quot; heading in the &quot;Extensions&quot; page" skip="false">
-      </subitem>
-      <subitem label="Right-click and select &quot;New-&gt;view&quot; from the context menu" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;id&quot; text box under &quot;Extension Element Details&quot; with &quot;com.example.helloworld.view.helloworldview&quot;" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;name&quot; text box with &quot;Hello World!&quot;" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;class&quot; text box with &quot;com.example.helloworld.view.SampleView&quot;" skip="false">
-      </subitem>
-      <subitem label="Replace the content of the &quot;category&quot; text box with &quot;com.example.helloworld.view.helloworldcategory&quot;" skip="false">
-      </subitem>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" skip="false">
-      </subitem>
-   </item>
-   <item title="Create a view class" dialog="true" skip="false">
-      <description>
-         To create a view class, perform the following steps:
-      </description>
-      <subitem label="Click the &quot;class&quot; hyperlink under &quot;Extension Element Details&quot; to start the &quot;New Java Class&quot; wizard" skip="false">
-      </subitem>
-      <subitem label="Accept the default values and click the &quot;Finish&quot; button to exit the wizard" skip="false">
-      </subitem>
-   </item>
-   <item title="Add view class code" dialog="true" skip="false">
-      <description>
-         We are now going to add code to our view class to simply
-         display a &quot;Hello, Eclipse world!&quot; message in the view when
-         it is opened.
-         <br/>
-         <br/>
-         The previous step should have opened the <b>SampleView</b> class
-         in a Java editor.
-         <br/>
-         <br/>
-         Add the following lines of code under the pre-generated 
-         <b>createPartControl</b> method:
-         <br/>
-         <br/>
-		 Label label = new Label( parent, SWT.LEFT );
-         <br/>
-		 label.setText( &quot;Hello, Eclipse world!&quot; );
-         <br/>
-         <br/>
-         Note:  There will be two import errors to correct.
-         <br/>
-         Either add the following import statements manually or
-         click on the lightbulb icons in the margin of the Java
-         editor to add them:
-         <br/>
-         <br/>
-		 import org.eclipse.swt.widgets.Label;
-         <br/>
-		 import org.eclipse.swt.SWT;
-		 <br/>
-		 <br/>
-		 Select &quot;File-&gt;Save&quot; from the main menu
-      </description>
-   </item>
-   <item title="Test the plug-in" dialog="true" skip="false" href="/org.eclipse.pde.doc.user/guide/tools/launchers/eclipse_application_launcher.htm">
-      <description>
-         To test your Eclipse plug-in inside a target Eclipse platform,
-         perform the following steps:
-      </description>
-      <subitem label="Open the plug-in editor" skip="false">
-         <command
-               confirm="false"
-               required="false"
-	           translate=""
-               serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.helloworld/plugin.xml)">
-         </command>
-      </subitem>
-      <subitem label="Select the &quot;Overview&quot; tab to display the &quot;Overview&quot; page" skip="false">
-      </subitem>
-      <subitem label="Click the &quot;Launch an Eclipse application&quot; hyperlink under the &quot;Testing&quot; heading" skip="false">
-      </subitem>
-      <subitem label="Select &quot;Window-&gt;Show View-&gt;Other...&quot; from the main menu in the newly launched Eclipse platform" skip="false">
-      </subitem>
-      <subitem label="Note the &quot;Hello World!&quot; category and expand its tree dialog" skip="false">
-      </subitem>
-      <subitem label="Select the &quot;Hello World!&quot; view and click the &quot;OK&quot; button" skip="false">
-      </subitem>
-      <subitem label="Select &quot;File-&gt;Exit&quot; from the main menu to exit the target Eclipse platform" skip="false">
-      </subitem>
-   </item>
-</cheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-feature.xml b/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-feature.xml
deleted file mode 100644
index 52380ac..0000000
--- a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-feature.xml
+++ /dev/null

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-    Copyright (c) 2005, 2010 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Create a feature">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to create a feature for a plug-in using
-         PDE. 
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-
-   <!-- Item -->
-
-   <item title="Open the plug-in development perspective"
-         href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Create the feature"
-         href="/org.eclipse.pde.doc.user/guide/tools/project_wizards/new_feature_project.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To create the feature, perform the following steps:
-      </description>
-      <subitem label="Select &quot;File-&gt;New-&gt;Project...&quot;, and choose &quot;Feature Project&quot; under the &quot;Plug-in Development&quot; heading" 
-               skip="false">
-         <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.pde.ui.NewFeatureProjectWizard)" required="false" translate="" />
-      </subitem>
-      <subitem label="Input &quot;com.example.feature&quot; into the &quot;Project Name&quot; text box on the &quot;Feature Properties&quot; page" 
-               skip="false"/>
-      <subitem label="Input &quot;Hello World! Feature&quot; into the &quot;Feature Name&quot; text box and click &quot;Next &gt;&quot;" 
-               skip="false"/>
-      <subitem label="Select the &quot;com.example.helloworld&quot; checkbox on the &quot;Referenced Plug-ins and Fragments&quot; page and click &quot;Finish&quot;" 
-               skip="false"/>  
-   </item>
-
-   <!-- Item -->
-
-   <item title="Add a feature description and license agreement"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/information.htm"
-         skip="false">
-      <description>
-         The <b>com.example.helloworld</b> feature editor should be opened
-         on the <b>Overview</b> page.
-         <br/>
-         <br/>
-         To add a feature description and license agreement, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Information&quot; tab" 
-               skip="false"/>  
-      <subitem label="Input &quot;Hello, Eclipse world! feature description&quot; into the &quot;Text&quot; dialog box" 
-               skip="false"/>  
-      <subitem label="Select the &quot;Copyright Notice&quot; tab within the &quot;Information&quot; page" 
-               skip="false"/>  
-      <subitem label="Input &quot;(C) 2006&quot; into the &quot;Text&quot; dialog box" 
-               skip="false"/>
-      <subitem label="Select the &quot;License Agreement&quot; tab within the &quot;Information&quot; page" 
-               skip="false"/>  
-      <subitem label="Input &quot;Hello, Eclipse world! license agreement&quot; into the &quot;Text&quot; dialog box" 
-               skip="false"/>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>
-   </item>
-
-</cheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-install.xml b/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-install.xml
deleted file mode 100644
index d93aac9..0000000
--- a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-install.xml
+++ /dev/null

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-     Copyright (c) 2005, 2009 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Install and uninstall a feature">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to install and uninstall a feature
-         using Install/Update.
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-   <!-- Item -->
-
-   <item title="Register the update site with Eclipse"
-         dialog="true"
-         skip="false">
-      <description>
-         To register the update site with Eclipse, perform the following steps:
-      </description>
-      <subitem label="Select &quot;Help-&gt;Install New Software...&quot; from the main menu to launch the &quot;Install&quot; wizard" 
-               skip="false"/>  
-      <subitem label="Click &quot;Add...&quot;" 
-               skip="false"/>              
-      <subitem label="Click &quot;Local...&quot;, browse to &quot;C:\helloworld.site&quot; in the dialog.  Click &quot;OK&quot; to add the site" 
-               skip="false"/>  
-      <subitem label="Note that the &quot;Install&quot; wizard changes to display the contents of the added site" 
-               skip="false"/>  
-   </item>
-
-
-   <!-- Item -->
-
-   <item title="Install the feature"
-         dialog="true"
-         skip="false">
-      <description>
-         To install the feature, perform the following steps:
-      </description>
-      <subitem
-            label="Ensure that &apos;Install&apos; wizard is open. If not, launch it by selecting &quot;Help-&gt;Install New Software...&quot; from the main menu"
-            skip="true">
-      </subitem>
-      <subitem label="Select the &quot;C:\helloworld.site&quot; site in the &quot;Work with&quot; combo" 
-               skip="false"/>              
-      <subitem label="If the &quot;Group items by category&quot; option is checked, the &quot;Hello World!&quot; feature category should be visible" 
-               skip="false"/>  
-      <subitem label="Check the &quot;Hello World! Feature&quot; feature" 
-               skip="false"/> 
-      <subitem label="Click &quot;Next &gt;&quot;.  The installer will calculate what needs to be installed" 
-               skip="false"/>
-      <subitem
-            label="Select the &quot;Hello World! Feature&quot; entry in the feature table on the &quot;Install Details&quot; page"
-            skip="true">
-      </subitem>
-      <subitem
-            label="Verify that &quot;Details&quot; section displays the feature description as &quot;Hello, Eclipse world! feature description&quot;"
-            skip="true">
-      </subitem>
-      <subitem
-            label="Click Next. &quot;Review Licenses&quot; page will come up displaying the license &quot;Hello, Eclipse world! license agreement&quot; in the  &quot;License text&quot; text box">
-      </subitem>
-      <subitem
-            label="Accept the license by clicking the option &quot;I accept the terms of the license agreement&quot;">
-      </subitem>  
-      <subitem label="Click &quot;Finish&quot; to install the feature" 
-               skip="false"/>  
-      <subitem label="When the installation completes, a dialog asking you to restart will open.  Click &quot;Yes&quot; to restart and finish the install" 
-               skip="false"/>  
-   </item>
-
-   <!-- Item -->
-
-   <item title="Verify the feature installation"
-         dialog="true"
-         skip="false">
-      <description>
-         To verify the feature installation, perform the following steps after 
-         Eclipse restarts:
-      </description>
-      <subitem label="Select &quot;Help-&gt;About Eclipse SDK&quot; from the main menu" 
-               skip="false"/>
-      <subitem
-            label="Click &quot;Installation Details&quot; button on the &quot;About Eclipse SDK&quot; dialog box">
-      </subitem>  
-      <subitem label="Note the &quot;Hello World! Feature&quot; on &quot;Installed Software&quot; tab of the &quot;Eclipse SDK Installations Details&quot; dialog" 
-               skip="false"/>  
-   </item>
-
-   <!-- Item -->
-
-   <item title="Uninstall the feature"
-         dialog="true"
-         skip="false">
-      <description>
-         To uninstall the feature, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Hello World! Feature&quot; feature within the table on &quot;Installed Software&quot;  tab of the &quot;Eclipse SDK Installations Details&quot; dialog box" 
-               skip="false"/>  
-      <subitem label="Click &quot;Uninstall...&quot; button" 
-               skip="false"/>  
-      <subitem label="Click &quot;Finish&quot; in the resulting &quot;Uninstall&quot; dialog box" 
-               skip="false"/>  
-      <subitem label="Click &quot;Yes&quot; from the &quot;Software Updates&quot; dialog box to restart the Eclipse workbench" 
-               skip="false"/>  
-   </item>
-
-</cheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-update.xml b/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-update.xml
deleted file mode 100644
index 4021f7d..0000000
--- a/ui/org.eclipse.pde/cheatsheets/helloworld/helloworld-update.xml
+++ /dev/null

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-     Copyright (c) 2005, 2009 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Create an update site">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to create an update site for a plug-in
-         using PDE.
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-
-   <!-- Item -->
-
-   <item title="Open the plug-in development perspective"
-         href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Create the update site"
-         dialog="true"
-         href="/org.eclipse.pde.doc.user/guide/tools/project_wizards/new_update_site_project.htm"
-         skip="false">
-      <description>
-         To create the update site, perform the following steps:
-      </description>
-      <subitem label="Select &quot;File-&gt;New-&gt;Project...&quot;, and choose &quot;Update Site Project&quot; under the &quot;Plug-in Development&quot; heading" 
-               skip="false">
-         <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.pde.ui.NewSiteProjectWizard)" required="false" translate="" />
-      </subitem>
-      <subitem label="Input &quot;helloworld.site&quot; into the &quot;Project Name&quot; text box on the &quot;Update Site Project&quot; page" 
-               skip="false"/>
-      <subitem label="Deselect the &quot;Use default location&quot; check box"
-               skip="false"/>  
-      <subitem label="Note:  For the purpose of this cheat sheet we will define a Windows pathname for our update site location.  For Unix platforms, adjust accordingly." 
-               skip="true"/>  
-      <subitem label="Input &quot;C:\helloworld.site&quot; in the &quot;Location&quot; text box and click &quot;Finish&quot;" 
-               skip="false"/>  
-   </item>
-
-   <!-- Item -->
-
-   <item title="Create the update site description"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/site_editor/archives.htm"
-         skip="false">
-      <description>
-         The site editor should be open on the <b>Site Map</b> tab.
-         <br/>
-         <br/>
-         To create the update site description, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Archives&quot; tab" 
-               skip="false"/>  
-      <subitem label="Input &quot;file:///C:/helloworld.site/&quot; into the &quot;URL&quot; text box" 
-               skip="false"/>
-      <subitem label="Input &quot;Hello World! Update Site&quot; into the &quot;Description&quot; text box" 
-               skip="false"/>
-      <subitem label="Click &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>  
-   </item>
-
-   <!-- Item -->
-
-   <item title="Create a feature category"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/site_editor/site_map.htm"
-         skip="false">
-      <description>
-         To create a feature category, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Site Map&quot; tab from the site editor" 
-               skip="false"/>  
-      <subitem label="Click the &quot;New Category&quot; button" 
-               skip="false"/>  
-      <subitem label="Input &quot;Hello World!&quot; into the &quot;ID&quot; text box" 
-               skip="false"/>
-      <subitem label="Input &quot;Hello World!&quot; into the &quot;Name&quot; text box" 
-               skip="false"/>
-      <subitem label="Click &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>  
-   </item>
-
-   <!-- Item -->
-
-   <item title="Add a feature to a feature category"
-         dialog="true"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/site_editor/site_map.htm"
-         skip="false">
-      <description>
-         To add a feature to a feature category, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Hello World!&quot; feature category in the &quot;Managing the Site&quot; list box" 
-               skip="false"/>  
-      <subitem label="Click the &quot;Add Feature...&quot; button" 
-               skip="false"/>  
-      <subitem label="Select &quot;com.example.feature&quot; from the list box and click &quot;OK&quot;" 
-               skip="false"/>  
-      <subitem label="Click &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>                 
-   </item>
-
-   <!-- Item -->
-
-   <item title="Build and export a feature to an update site"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/site_editor/site_map.htm"
-         skip="false">
-      <description>
-         To build a feature and export it to an update site, perform the following steps:
-      </description>
-      <subitem label="Click the &quot;Build All&quot; button" 
-               skip="false"/>  
-      <subitem label="Verify the &quot;com.example.helloworld_1.0.0.jar&quot; jar file has been created in the &quot;plugins&quot; folders on the update site (See the &quot;Package Explorer&quot; view or the &quot;C:\helloworld.site&quot; folder)" 
-               skip="true"/>    
-      <subitem label="Verify the &quot;com.example.feature_1.0.0.jar&quot; jar file has been created in the &quot;features&quot; folders on the update site" 
-               skip="true"/>    
-               
-                           
-   </item>
-
-</cheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/rcpapp-composite.xml b/ui/org.eclipse.pde/cheatsheets/rcpapp-composite.xml
deleted file mode 100644
index 8b90cf8..0000000
--- a/ui/org.eclipse.pde/cheatsheets/rcpapp-composite.xml
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Composite Cheat Sheet -->
-
-<compositeCheatsheet name="Creating a Rich Client Application">
-
-   <!-- Task Group -->
-
-   <taskGroup kind="set" name="Create a rich client application">
-      <intro>
-         This cheat sheet will guide you through the individual steps to 
-         create a plug-in, define a plug-in based product, customize
-         a product, export a Rich Client Platform (RCP) application and define a feature-based
-         product using the Plug-in Development Environment (PDE).
-         <br/>
-         <br/>
-         To assist you along the way, wizards and commands
-         will be available for you to launch automatically.
-      </intro>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Create a plug-in">
-         <intro>
-            This cheat sheet will demonstrate how to create and run a minimal RCP application. 
-         </intro>
-         <param name="path" value="rcpapp/rcpapp-create.xml" />
-         <onCompletion>
-         	Congratulations!  You just created an RCP application!
-         </onCompletion>
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Define a plug-in based product">
-         <intro>
-            This cheat sheet will demonstrate how to define and run a plug-in
-            based product configuration.  
-         </intro>
-         <param name="path" value="rcpapp/rcpapp-plugin-product.xml" />
-         <onCompletion>
-         	Congratulations!  You just defined a plug-in based product configuration for an RCP application!
-         </onCompletion>
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Customize a product">
-         <intro>
-         This cheat sheet will demonstrate how to add window images,
-         add a splash screen and customize a launcher for an RCP
-         application.  
-         </intro>
-         <param name="path" value="rcpapp/rcpapp-customize.xml" />
-         <onCompletion>
-         	Congratulations!  You just customized your product configuration!
-         </onCompletion>
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Export an RCP product">
-         <intro>
-         This cheat sheet will demonstrate how to modify a product 
-         configuration and export a standalone RCP product.
-         </intro>
-         <param name="path" value="rcpapp/rcpapp-export.xml" />
-         <onCompletion>
-         	Congratulations!  You just exported a fully-branded product!
-         </onCompletion>
-      </task>
-
-      <!-- Task -->
-
-      <task kind="cheatsheet" name="Define a feature-based product">
-         <intro>
-         This cheat sheet will demonstrate how to convert a plug-in based product
-         configuration to a feature-based one. 
-         </intro>
-         <param name="path" value="rcpapp/rcpapp-feature-product.xml" />
-         <onCompletion>
-         	Congratulations!  You just defined a feature-based product!
-         </onCompletion>
-      </task>
-
-      <onCompletion>
-         Congratulations!  You just created a plug-in, defined a plug-in based product, 
-         customized a product, exported an RCP product and defined a feature-based
-         product using PDE.
-      </onCompletion>
-
-   </taskGroup>
-
-
-</compositeCheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-create.xml b/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-create.xml
deleted file mode 100644
index 7af1073..0000000
--- a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-create.xml
+++ /dev/null

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Create a plug-in">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to create and run an
-         RCP application using PDE. 
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-   <!-- Item -->
-
-   <item title="Open the plug-in development perspective"
-         href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Create the plug-in"
-         href="/org.eclipse.pde.doc.user/guide/tools/project_wizards/new_plugin_project.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To create the plug-in, perform the following steps:
-      </description>
-      <subitem label="Select &quot;File-&gt;New-&gt;Project...&quot; from the main menu, expand the &quot;Plug-in Development&quot; category within the resulting &quot;New Project&quot; dialog box, and choose &quot;Plug-in Project&quot;" 
-               skip="false">
-         <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.pde.ui.NewProjectWizard)" required="false" translate="" />
-      </subitem>
-      <subitem label="Input &quot;com.example.rcpapp&quot; into the &quot;Project Name&quot; text box on the &quot;Plug-in Project&quot; page and click &quot;Next &gt;&quot;" 
-               skip="false"/>
-      <subitem label="Select the &quot;Yes&quot; radio button under the &quot;Rich Client Application&quot; heading on the &quot;Plug-in Content&quot; page and click &quot;Next &gt;&quot;" 
-               skip="false"/>
-      <subitem label="Select the &quot;Hello RCP&quot; template from the list of &quot;Available Templates&quot; and click &quot;Finish&quot;" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Run the RCP Application"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/launchers/eclipse_application_launcher.htm"
-         skip="false">
-      <description>
-         To run the RCP application,
-         perform the following steps:
-      </description>
-      <subitem label="Select the &quot;com.example.rcpapp&quot; plug-in editor from the workbench and select the &quot;Overview&quot; tab within it" 
-               skip="false">
-         <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/META-INF/MANIFEST.MF)" required="false" translate="" />
-      </subitem>               
-      <subitem label="Click the &quot;Launch an Eclipse application&quot; hyperlink under the &quot;Testing&quot; heading" 
-               skip="false"/>
-      <subitem label="Verify that you see an empty window with a window title of &quot;Hello RCP&quot;" 
-               skip="true"/>
-      <subitem label="Exit the RCP application" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Modify the plug-in source"
-         dialog="true"
-         skip="false">
-      <description>
-         In this step, we want to suppress the <b>Hello RCP</b> text in
-         the window title bar of our RCP application.
-         <br/>
-         <br/>
-         To modify the plug-in source accordingly, 
-         perform the following steps:
-      </description>
-      <subitem label="Open &quot;ApplicationWorkbenchWindowAdvisor.java&quot; by locating it in the &quot;src&quot; folder of the &quot;com.example.rcpapp&quot; package in the &quot;Package Explorer&quot; view and double-clicking it" 
-               skip="false">                                                    
-         <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/src/com/example/rcpapp/ApplicationWorkbenchWindowAdvisor.java)" required="false" translate="" />
-      </subitem>
-      <subitem label="Comment out &apos;configurer.setTitle(&quot;Hello RCP&quot;);&apos; in the &quot;preWindowOpen()&quot; method" 
-               skip="false"/>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Test the RCP Application"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/launchers/eclipse_application_launcher.htm"
-         skip="false">
-      <description>
-         To test the RCP application,
-         perform the following steps:
-      </description>
-      <subitem label="Select the &quot;com.example.rcpapp&quot; plug-in editor from the workbench and select the &quot;Overview&quot; tab within it" 
-               skip="false">
-         <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/META-INF/MANIFEST.MF)" required="false" translate="" />
-      </subitem>               
-      <subitem label="Click the &quot;Launch an Eclipse application&quot; hyperlink under the &quot;Testing&quot; heading" 
-               skip="false"/>
-      <subitem label="Verify that you see an empty window with no window title" 
-               skip="true"/>
-      <subitem label="Exit the RCP application" 
-               skip="false"/>
-   </item>
-
-</cheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-customize.xml b/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-customize.xml
deleted file mode 100644
index 6db3d7b..0000000
--- a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-customize.xml
+++ /dev/null

@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Customize a product">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to add window images,
-         add a splash screen and customize a launcher for an RCP
-         application using PDE.  
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-   <!-- Item -->
-
-   <item title="Open the plug-in development perspective"
-         href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Open the product editor"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/editor.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the product editor (if it is not already open),
-         expand the <b>com.example.rcpapp</b> tree dialog
-         in the <b>Package Explorer</b> view and double-click
-         on the <b>rcpapp.product</b> file (the <b>Overview</b> page
-         should be open initially).
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.         
-      </description>
-      <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/rcpapp.product)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Add window images"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/branding.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To add window images, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Branding&quot; tab within the product editor to display the &quot;Branding&quot; page" 
-               skip="false"/>
-      <subitem label="Click the &quot;Browse&quot; button adjacent to the &quot;16x16&quot; text box under the &quot;Window Images&quot; heading" 
-               skip="false"/>
-      <subitem label="Fully expand the &quot;com.example.rcpapp&quot; tree in the &quot;Image Selection&quot; dialog box and select &quot;alt_window_16.gif&quot; and click &quot;OK&quot;" 
-               skip="false"/>
-      <subitem label="Click the &quot;Browse&quot; button adjacent to the &quot;32x32&quot; text box under the &quot;Window Images&quot; heading" 
-               skip="false"/>  
-      <subitem label="Fully expand the &quot;com.example.rcpapp&quot; tree in the &quot;Image Selection&quot; dialog box and select &quot;alt_window_32.gif&quot; and click &quot;OK&quot;" 
-               skip="false"/>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/> 
-   </item>   
-
-   <!-- Item -->
-
-   <item title="Test the RCP product"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/overview.htm"
-         skip="false">
-      <description>
-         To test the RCP product,
-         perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Overview&quot; tab within the product editor to display the &quot;Overview&quot; page" 
-               skip="false"/>      
-      <subitem label="Click the &quot;Launch an Eclipse Application&quot; hyperlink under the &quot;Testing&quot; heading" 
-               skip="false"/>
-      <subitem label="Note the image in the window title bar (if applicable on your platform)" 
-               skip="true"/>
-      <subitem label="Exit the RCP application" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Add a splash screen"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/splash.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To add a splash screen, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Splash&quot; tab within the product editor to display the &quot;Splash&quot; page" 
-               skip="false"/>      
-      <subitem label="Click the &quot;Browse...&quot; button adjacent to the &quot;Plug-in&quot; text box under the &quot;Location&quot; heading" 
-               skip="false"/>
-      <subitem label="Select the &quot;com.example.rcpapp&quot; entry in the &quot;Plug-in Selection&quot; dialog box and click &quot;OK&quot;" 
-               skip="true"/>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>
-      <subitem label="Note:  Eclipse expects a file called &quot;splash.bmp&quot; to be located in the root of the specified plug-in. Verify that the root folder of &quot;com.example.rcpapp&quot; plug-in has the &quot;splash.bmp&quot;." 
-               skip="false"/>
-   </item>   
-
-   <!-- Item -->
-
-   <item title="Test the RCP product"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/overview.htm"
-         skip="false">
-      <description>
-         To test the RCP product,
-         perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Overview&quot; tab within the product editor to display the &quot;Overview&quot; page" 
-               skip="false"/>      
-      <subitem label="Click the &quot;Launch an Eclipse Application&quot; hyperlink under the &quot;Testing&quot; heading" 
-               skip="false"/>
-      <subitem label="Note the splash screen displayed before the RCP application window is visible" 
-               skip="true"/>
-      <subitem label="Exit the RCP application" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Customize the launcher"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/launcher.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         We will walk through this task assuming we are working on a Windows
-         platform (Similar steps may be followed for other platforms).
-         <br/>
-         <br/>
-         To customize the launcher, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Launching&quot; tab within the product editor to display the &quot;Launching&quot; page" 
-               skip="false"/>
-      <subitem label="Input &quot;rcpapp&quot; into the &quot;Launcher Name&quot; text box under the &quot;Program Launcher&quot; heading" 
-               skip="false"/>
-      <subitem label="Select the &quot;win32&quot; tab under the &quot;Program Launcher&quot; heading" 
-               skip="true"/>
-      <subitem label="Select the &quot;Use a single ICO file containing 6 images as specified above&quot; radio button" 
-               skip="true"/>
-      <subitem label="Click the &quot;Browse...&quot; button adjacent to the &quot;File&quot; text box" 
-               skip="true"/>
-      <subitem label="Fully expand the &quot;com.example.rcpapp&quot; tree in the &quot;Image Selection&quot; dialog box and select &quot;alt_launcher.ico&quot; and click &quot;OK&quot;" 
-               skip="true"/>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/> 
-   </item>   
-   
-</cheatsheet>
-   
-   

diff --git a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-export.xml b/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-export.xml
deleted file mode 100644
index dc89042..0000000
--- a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-export.xml
+++ /dev/null

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Export an RCP product">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to modify a build 
-         configuration and export an
-         RCP product using PDE.  
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-   <!-- Item -->
-
-   <item title="Open the plug-in development perspective"
-         href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Open the build configuration editor"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/manifest_editor/build.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the build configuration editor,
-         expand the <b>com.example.rcpapp</b> tree dialog
-         in the <b>Package Explorer</b> view and double-click
-         on the <b>build.properties</b> file.
-         <br/>
-         <br/>
-         Select the <b>Build</b> tab to display the <b>Build Configuration</b> 
-         page if it is not the initial page.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.         
-      </description>
-      <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/build.properties)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Modify the build configuration"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/manifest_editor/build.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         In order to control what files are deployed with our packaged
-         RCP application, we need to modify the build configuration.
-         <br/>
-         <br/>
-         To modify the build configuration, perform the following steps:
-      </description>
-      <subitem label="Select the checkbox corresponding to the &quot;icons&quot; directory under the &quot;Binary Build&quot; heading" 
-               skip="false"/>
-      <subitem label="Select the checkbox corresponding to the &quot;splash.bmp&quot; file under the &quot;Binary Build&quot; heading" 
-               skip="true"/>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Open the product editor"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/editor.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the product editor (if it is not already open),
-         expand the <b>com.example.rcpapp</b> tree dialog
-         in the <b>Package Explorer</b> view and double-click
-         on the <b>rcpapp.product</b> file.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.         
-      </description>
-      <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/rcpapp.product)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Export the plug-in based product"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/overview.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To export the plug-in based product, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Overview&quot; tab within the product editor to display the &quot;Overview&quot; page" 
-               skip="false"/>     
-      <subitem label="Click the &quot;Eclipse Product export wizard&quot; hyperlink under the &quot;Exporting&quot; heading to launch the &quot;Export&quot; dialog box" 
-               skip="false">
-         <command serialization="org.eclipse.ui.file.export(exportWizardId=org.eclipse.pde.ui.productExportWizard)" required="false" translate="" />
-      </subitem>
-      <subitem label="Verify that &quot;/com.example.rcpapp/rcpapp.product&quot; is entered in the &quot;Configuration&quot; combo box within the &quot;Product Configuration&quot; group" 
-               skip="true"/>
-      <subitem label="Input &quot;rcpapp_plugin-based&quot; in the &quot;Root directory&quot; text box contained in the &quot;Product Configuration&quot; group" 
-               skip="false"/>
-      <subitem label="Input a destination directory in the &quot;Directory&quot; text box under the &quot;Destination&quot; group (e.g. &quot;C:\&quot; for Windows) and click &quot;Finish&quot;" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Browse the exported plug-in based product directory"
-         dialog="true"
-         skip="false">
-      <description>
-         To browse the exported plug-in based product directory, perform the following steps:
-      </description>
-      <subitem label="Navigate your file system to the destination directory specified in the previous step (e.g. &quot;C:\&quot; for Windows)" 
-               skip="false"/>
-      <subitem label="Note the presence of the &quot;rcpapp_plugin-based&quot; directory in the destination directory and open it" 
-               skip="false"/>
-      <subitem label="Note the presence of the &quot;com.example.rcpapp&quot; plug-in along with many other RCP plug-ins it depends upon within the &quot;plugins&quot; sub-directory" 
-               skip="true"/>
-      <subitem label="Note the &quot;rcpapp&quot; launcher with a branded icon (&quot;rcpapp.exe&quot; on Windows)" 
-               skip="false"/>                 
-      <subitem label="Run the &quot;rcpapp&quot; launcher" 
-               skip="false"/>    
-      <subitem label="Observe the plug-in based RCP application you created that is fully executable outside the Eclipse workspace" 
-               skip="true"/>                   
-      <subitem label="Exit the RCP application" 
-               skip="false"/>     
-   </item>
-      
-</cheatsheet>
-

diff --git a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-feature-product.xml b/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-feature-product.xml
deleted file mode 100644
index 7612c8f..0000000
--- a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-feature-product.xml
+++ /dev/null

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Define a feature based product">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to define a feature based product
-         configuration using a plug-in based one and create a feature for an RCP
-         application using PDE.  
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-   <!-- Item -->
-
-   <item title="Open the plug-in development perspective"
-         href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Open the product editor"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/editor.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the product editor (if it is not already open),
-         expand the <b>com.example.rcpapp</b> tree dialog
-         in the <b>Package Explorer</b> view and double-click
-         on the <b>rcpapp.product</b> file.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.         
-      </description>
-      <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/rcpapp.product)" required="false" translate="" />
-   </item>
-
-   <item title="Switch to a feature based product configuration"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/overview.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         Select the <b>Overview</b> tab to display the <b>Overview</b> 
-         page if it is not the initial page.
-         <br/>
-         <br/>
-         To switch to a feature based product configuration, 
-         select the <b>features</b> radio button under the <b>Product Definition</b> heading.
-         <br/>
-         <br/>
-         Select <b>File-&gt;Save</b> from the main menu.         
-      </description>
-   </item>
-
-   <item title="Create the feature"
-         href="/org.eclipse.pde.doc.user/guide/tools/project_wizards/new_feature_project.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To create the feature, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Dependencies&quot; tab to display the &quot;Dependencies&quot; page" 
-               skip="false"/>
-      <subitem label="Select the &quot;New Feature...&quot; tool button in the &quot;Features&quot; section." 
-               skip="false"/>
-      <subitem label="Input &quot;com.example.feature&quot; into the &quot;Project Name&quot; text box on the &quot;Feature Properties&quot; page" 
-               skip="false"/>
-      <subitem label="Input &quot;RCP Application Feature&quot; into the &quot;Feature Name&quot; text box and click &quot;Next &gt;&quot;" 
-               skip="false"/>
-      <subitem label="Select the &quot;com.example.rcpapp&quot; checkbox on the &quot;Refererenced Plug-ins and Fragments&quot; page and click &quot;Finish&quot;" 
-               skip="false"/>  
-   </item>
-
-   <!-- Item -->
-
-   <item title="Add a feature description and license agreement"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/information.htm"
-         skip="false">
-      <description>
-         The <b>com.example.rcpapp</b> feature editor should be opened
-         on the <b>Overview</b> page.
-         <br/>
-         <br/>
-         To add a feature description and license agreement, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Information&quot; tab" 
-               skip="false"/>  
-      <subitem label="Input &quot;RCP application feature description&quot; into the &quot;Text&quot; text box within the &quot;Feature Description&quot; tab" 
-               skip="false"/>  
-      <subitem label="Select the &quot;License Agreement&quot; tab within the &quot;Information&quot; page" 
-               skip="false"/>  
-      <subitem label="Input &quot;RCP application license agreement&quot; into the &quot;Text&quot; text box" 
-               skip="false"/>
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Add features to the product configuration"
-         dialog="true"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/configuration.htm"
-         skip="false">
-      <description>
-         To add features to the product configuration, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;rcpapp.product&quot; tab in the workbench to return back to the product editor (opened on the &quot;Dependencies&quot; page)" 
-               skip="false">
-         <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/rcpapp.product)" required="false" translate="" />
-      </subitem>  
-      <subitem label="Click the &quot;Add...&quot; button under the &quot;Features&quot; heading" 
-               skip="false"/>  
-      <subitem label="Select the &quot;org.eclipse.rcp&quot; feature within the &quot;Feature Selection&quot; dialog box and click &quot;OK&quot;" 
-               skip="false"/>  
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Export the feature based product"
-         href="/org.eclipse.pde.doc.user/guide/tools/export_wizards/export_product.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To export the feature based product, perform the following steps:
-      </description>
-      <subitem label="Select the &quot;Overview&quot; tab to display the &quot;Overview&quot; page" 
-               skip="false"/>      
-      <subitem label="Click the &quot;Eclipse Product export wizard&quot; hyperlink under the &quot;Exporting&quot; heading to launch the &quot;Export&quot; dialog box" 
-               skip="false">
-         <command serialization="org.eclipse.ui.file.export(exportWizardId=org.eclipse.pde.ui.productExportWizard)" required="false" translate="" />
-      </subitem>
-      <subitem
-            label="Verify that &quot;/com.example.rcpapp/rcpapp.product&quot; is entered in the &quot;Configuration&quot; combo box within the &quot;Product Configuration&quot; group"
-            skip="true">
-      </subitem>
-      <subitem label="Input &quot;rcpapp_feature-based&quot; in the &quot;Root directory&quot; text box contained in the &quot;Product Configuration&quot; group" 
-               skip="false"/>
-      <subitem label="Input a destination directory in the &quot;Directory&quot; text box under the &quot;Destination&quot; group (e.g. &quot;C:\&quot; for Windows) and click &quot;Finish&quot;" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Browse the exported feature based product directory"
-         dialog="true"
-         skip="false">
-      <description>
-         To browse the exported feature based product directory, perform the following steps:
-      </description>
-      <subitem label="Navigate your file system to the destination directory specified in the previous step (e.g. &quot;C:\&quot; for Windows)" 
-               skip="false"/>
-      <subitem label="Note the presence of the &quot;rcpapp_feature-based&quot; directory in the destination directory and open it" 
-               skip="false"/>
-      <subitem label="Note the presence of the &quot;com.example.rcpapp&quot; plug-in along with other RCP plug-ins it depends upon within the &quot;plugins&quot; sub-directory" 
-               skip="true"/>
-      <subitem label="Note the presence of the &quot;com.example.rcpapp&quot; feature and &quot;org.eclipse.rcp&quot; feature within the &quot;features&quot; sub-directory" 
-               skip="true"/>
-      <subitem label="Note the &quot;rcpapp&quot; launcher with a branded icon (&quot;rcpapp.exe&quot; on Windows)" 
-               skip="false"/>                 
-      <subitem label="Run the &quot;rcpapp&quot; launcher" 
-               skip="false"/>    
-      <subitem label="Observe the feature based RCP application you created that is fully executable outside the Eclipse workspace" 
-               skip="true"/>    
-   </item>
-      
-</cheatsheet>
-

diff --git a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-plugin-product.xml b/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-plugin-product.xml
deleted file mode 100644
index 6636e8b..0000000
--- a/ui/org.eclipse.pde/cheatsheets/rcpapp/rcpapp-plugin-product.xml
+++ /dev/null

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- Simple Cheat Sheet -->
-
-<cheatsheet title="Define a plug-in based product">
-
-   <!-- Introduction -->
-
-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
-      <description>
-         This cheat sheet will demonstrate how to define a plug-in based
-         product configuration for an RCP application and run an RCP application 
-         product using PDE.  
-         <br/>
-         <br/>
-         To learn more about using cheat sheets, click the help button
-         in the top right corner (?). 
-      </description>
-   </intro>
-
-   <!-- Item -->
-
-   <item title="Open the plug-in development perspective"
-         href="/org.eclipse.pde.doc.user/guide/tools/views/views.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the plug-in development perspective,
-         select <b>Window-&gt;Open Perspective-&gt;Other...</b> 
-         and choose <b>Plug-in Development</b>.
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.
-      </description>
-      <command serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.pde.ui.PDEPerspective)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Create the product configuration"
-         href="/org.eclipse.pde.doc.user/guide/tools/file_wizards/new_product_config.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To create the product configuration, perform the following steps:
-      </description>
-      <subitem label="Select &quot;File-&gt;New-&gt;Product Configuration&quot; from the main menu" 
-               skip="false">
-         <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.pde.ui.NewProductConfigurationWizard)" required="false" translate="" />
-      </subitem>
-      <subitem label="Select &quot;com.example.rcpapp&quot; in the resulting &quot;New Product Configuration&quot; wizard page" 
-               skip="false"/>
-      <subitem label="Input &quot;rcpapp.product&quot; into the &quot;File name&quot; text box" 
-               skip="false"/>
-      <subitem label="Select the &quot;Use a launch configuration&quot; radio button inside the &quot;Initialize the file content&quot; group and verify that &quot;com.example.rcpapp.application&quot; is selected in the  combo box. Click &quot;Finish&quot;" 
-               skip="false"/>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Open the product editor"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/editor.htm"
-         dialog="false"
-         skip="false">
-      <description>
-         To open the product editor (if it is not already open),
-         expand the <b>com.example.rcpapp</b> tree dialog
-         in the <b>Package Explorer</b> view and double-click
-         on the <b>rcpapp.product</b> file (the <b>Overview</b> page
-         should be open initially).
-         <br/>
-         <br/>
-         Alternatively, click the following button to perform the task.         
-      </description>
-      <command serialization="org.eclipse.ui.navigate.openResource(filePath=/com.example.rcpapp/rcpapp.product)" required="false" translate="" />
-   </item>
-
-   <!-- Item -->
-
-   <item title="Define the product"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/overview.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         To define the product, perform the following steps:
-      </description>
-      <subitem label="Click the &quot;New...&quot; button next to the &quot;Product ID&quot; drop down menu to open the &quot;New Product Definition&quot; dialog box" 
-               skip="false"/>
-      <subitem label="Input &quot;RCP Application&quot; into the &quot;Product Name&quot; text box" 
-               skip="false"/>
-      <subitem label="Verify &quot;com.example.rcpapp&quot; is the value entered for the &quot;Defining Plug-in&quot; text box" 
-               skip="true"/>        
-      <subitem label="Verify &quot;product&quot; is the value entered for the &quot;Product ID&quot; text box" 
-               skip="true"/>        
-      <subitem label="Accept the defaults and click &quot;Finish&quot;" 
-               skip="false"/>        
-      <subitem label="Select &quot;File-&gt;Save&quot; from the main menu" 
-               skip="false"/> 
-   </item>
-
-   <!-- Item -->
-
-   <item title="Synchronize the product configuration with the defining plug-in"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/overview.htm"
-         dialog="true"
-         skip="false">
-      <description>
-         Product configurations and their constituent files may become
-         unsynchronized.  This situation is apparent when changes 
-         made using the product editor are not reflected in the application.  
-         <br/>
-         <br/>
-         To synchronize the product configuration with the defining plug-in, 
-         click the <b>Synchronize</b> hyperlink under the <b>Testing</b>
-         heading on the product editor <b>Overview</b> page.
-         <br/>
-         <br/>
-         Note:  PDE automatically synchronizes the product configuration
-         when the <b>Launch an Eclipse Application</b> hyperlinks under the 
-         <b>Testing</b> heading are used.
-      </description>
-   </item>
-
-   <!-- Item -->
-
-   <item title="Run the RCP product"
-         dialog="false"
-         href="/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/overview.htm"
-         skip="false">
-      <description>
-         To run the RCP product,
-         perform the following steps:
-      </description>
-      <subitem label="Click the &quot;Launch an Eclipse application&quot; hyperlink under the &quot;Testing&quot; heading" 
-               skip="false"/>
-      <subitem label="Note: &quot;RCP Application&quot; now shows up in the window title bar" 
-               skip="true"/>
-      <subitem label="Exit the RCP application" 
-               skip="false"/>
-   </item>
-
-</cheatsheet>

diff --git a/ui/org.eclipse.pde/cheatsheets/setup-apitools-existing-projects.xml b/ui/org.eclipse.pde/cheatsheets/setup-apitools-existing-projects.xml
deleted file mode 100644
index 78ceb7a..0000000
--- a/ui/org.eclipse.pde/cheatsheets/setup-apitools-existing-projects.xml
+++ /dev/null

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

-<!--/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/-->

-<cheatsheet

-      title="Setting up API Tooling for existing plug-in projects">

-   <intro href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">

-      <description>

-         This cheat sheet will help in setting up API Tooling for existing plug-in projects.

-      </description>

-   </intro>

-   <item

-         skip="true"

-         title="Prerequisite">

-      <description>

-         The plug-in projects should be located in the workspace and be in open state. The API is public and the relevant packages are exported through the &quot;Exported Packages&quot; on the &quot;Runtime&quot; tab of the Manifest Editor.

-      </description>

-   </item>

-   <item

-         href="/org.eclipse.pde.doc.user/reference/api-tooling/actions/ref-apitooling-setup-action.htm"

-         title="Setting up API Tooling">

-      <description>

-      </description>

-      <subitem

-            label="Select any project in package explorer and invoke the &quot;API Tooling Setup&quot; wizard from &quot;PDE Tools&quot; in the right-click context menu.">

-      </subitem>

-      <subitem

-            label="Select all the projects for which API Tooling is to be enabled. Click &quot;Finish&quot;.">

-      </subitem>

-      <subitem

-            label="When prompted for setting up an API Baseline, select &quot;Yes&quot;.">

-      </subitem>

-      <subitem

-            label="You are now presented with the &quot;API Baseline&quot; preference page. Click &quot;Add Baseline&quot; to create a default baseline. Provide a name and location, where the location contains an older version of the bundle(s) you are enabling API Tooling for. Click &quot;Reset&quot;. Click &quot;Finish&quot;. This will trigger a full build.">

-      </subitem>

-   </item>

-   <item

-         title="Testing API Tooling">

-      <description>

-         This is optional and is there just to make sure everything is in place properly.

-         

-      </description>

-      <subitem

-            label="Open any class in one of the exported packages. Add a public function to it and save it."

-            skip="false">

-      </subitem>

-      <subitem

-            label="There will be two problems generated. Use a quick-fix to fix them. First, quick-fix the version change in MANIFEST.MF and then the @since tag to the newly added method."

-            skip="false">

-      </subitem>

-      <subitem

-            label="Select the class or project in the package explorer and select &quot;API Baseline&quot; from the &quot;Compare with&quot; right-click context menu.">

-      </subitem>

-      <subitem

-            label="Let the default baseline &quot;1.0&quot; be selected and click &quot;Finish&quot;.">

-      </subitem>

-      <subitem

-            label="The &quot;API Tooling&quot; view will open displaying the newly added method.">

-      </subitem>

-   </item>

-</cheatsheet>


diff --git a/ui/org.eclipse.pde/eclipse32.png b/ui/org.eclipse.pde/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/ui/org.eclipse.pde/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.gif b/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.gif
deleted file mode 100644
index 5457eaf..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48_hov.gif b/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48_hov.gif
deleted file mode 100644
index 553ef57..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48_hov.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.gif b/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.gif
deleted file mode 100644
index 15df922..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48_hov.gif b/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48_hov.gif
deleted file mode 100644
index 24df6ec..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48_hov.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.gif b/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.gif
deleted file mode 100644
index b017307..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48_hov.gif b/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48_hov.gif
deleted file mode 100644
index e31cd43..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48_hov.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.gif b/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.gif
deleted file mode 100644
index a432300..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48_hov.gif b/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48_hov.gif
deleted file mode 100644
index c95787e..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48_hov.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.gif b/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.gif
deleted file mode 100644
index e2e225c..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48_hov.gif b/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48_hov.gif
deleted file mode 100644
index b7431d9..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48_hov.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.gif b/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.gif
deleted file mode 100644
index bd63628..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48_hov.gif b/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48_hov.gif
deleted file mode 100644
index 4151477..0000000
--- a/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48_hov.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde/intro/css/overview.css b/ui/org.eclipse.pde/intro/css/overview.css
deleted file mode 100644
index 8b1359f..0000000
--- a/ui/org.eclipse.pde/intro/css/overview.css
+++ /dev/null

@@ -1,2 +0,0 @@
-a#pde img { background-image : url(../../images/topiclabel/ov_eclplugindev48.gif); }

-a#pde:hover img { background-image : url(../../images/topiclabel/ov_eclplugindev48_hov.gif); }


diff --git a/ui/org.eclipse.pde/intro/css/overview.properties b/ui/org.eclipse.pde/intro/css/overview.properties
deleted file mode 100644
index 232a149..0000000
--- a/ui/org.eclipse.pde/intro/css/overview.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-#  Copyright (c) 2007, 2008 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-overview.pde.link-icon = images/topiclabel/ov_eclplugindev48.gif
-overview.pde.hover-icon = images/topiclabel/ov_eclplugindev48_hov.gif

diff --git a/ui/org.eclipse.pde/intro/css/samples.css b/ui/org.eclipse.pde/intro/css/samples.css
deleted file mode 100644
index 53062eb..0000000
--- a/ui/org.eclipse.pde/intro/css/samples.css
+++ /dev/null

@@ -1,11 +0,0 @@
-a#swt-examples img { background-image : url(../../images/topiclabel/sa_samplecube48.gif); }

-a#swt-examples:hover img { background-image : url(../../images/topiclabel/sa_samplecube48_hov.gif); }

-

-a#multi-page-editor img { background-image : url(../../images/topiclabel/sa_sampleorb48.gif); }

-a#multi-page-editor:hover img { background-image : url(../../images/topiclabel/sa_sampleorb48_hov.gif); }

-

-a#property-sheet img { background-image : url(../../images/topiclabel/sa_sampleorb48.gif); }

-a#property-sheet:hover img { background-image : url(../../images/topiclabel/sa_sampleorb48_hov.gif); }

-

-a#readmetool img { background-image : url(../../images/topiclabel/sa_sampleorb48.gif); }

-a#readmetool:hover img { background-image : url(../../images/topiclabel/sa_sampleorb48_hov.gif); }


diff --git a/ui/org.eclipse.pde/intro/css/samples.properties b/ui/org.eclipse.pde/intro/css/samples.properties
deleted file mode 100644
index d038fc6..0000000
--- a/ui/org.eclipse.pde/intro/css/samples.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-###############################################################################
-#  Copyright (c) 2007, 2008 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-samples.link-icon = images/topiclabel/sa_sampleorb48.gif
-samples.hover-icon = images/topiclabel/sa_sampleorb48_hov.gif
-
-samples.swt-examples.link-icon = images/topiclabel/sa_samplecube48.gif
-samples.swt-examples.hover-icon = images/topiclabel/sa_samplecube48_hov.gif

diff --git a/ui/org.eclipse.pde/intro/css/tutorials.css b/ui/org.eclipse.pde/intro/css/tutorials.css
deleted file mode 100644
index a174f38..0000000
--- a/ui/org.eclipse.pde/intro/css/tutorials.css
+++ /dev/null

@@ -1,5 +0,0 @@
-a#rcp img { background-image : url(../../images/topiclabel/tu_rcpapp48.gif); }

-a#rcp:hover img { background-image : url(../../images/topiclabel/tu_rcpapp48_hov.gif); }

-

-a#pde-hello-world img { background-image : url(../../images/topiclabel/tu_createplugin48.gif); }

-a#pde-hello-world:hover img { background-image : url(../../images/topiclabel/tu_createplugin48_hov.gif); }


diff --git a/ui/org.eclipse.pde/intro/css/tutorials.properties b/ui/org.eclipse.pde/intro/css/tutorials.properties
deleted file mode 100644
index 729914d..0000000
--- a/ui/org.eclipse.pde/intro/css/tutorials.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-###############################################################################
-#  Copyright (c) 2007, 2008 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-tutorials.rcp.link-icon = images/topiclabel/tu_rcpapp48.gif
-tutorials.rcp.hover-icon = images/topiclabel/tu_rcpapp48_hov.gif
-
-tutorials.pde-hello-world.link-icon = images/topiclabel/tu_createplugin48.gif
-tutorials.pde-hello-world.hover-icon = images/topiclabel/tu_createplugin48_hov.gif

diff --git a/ui/org.eclipse.pde/intro/css/whatsnew.css b/ui/org.eclipse.pde/intro/css/whatsnew.css
deleted file mode 100644
index 3acee0a..0000000
--- a/ui/org.eclipse.pde/intro/css/whatsnew.css
+++ /dev/null

@@ -1,2 +0,0 @@
-a#pde-noteworthy img { background-image : url(../../images/topiclabel/wn_pluginenviro48.gif); }

-a#pde-noteworthy:hover img { background-image : url(../../images/topiclabel/wn_pluginenviro48_hov.gif); }


diff --git a/ui/org.eclipse.pde/intro/css/whatsnew.properties b/ui/org.eclipse.pde/intro/css/whatsnew.properties
deleted file mode 100644
index 8b9abfd..0000000
--- a/ui/org.eclipse.pde/intro/css/whatsnew.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-#  Copyright (c) 2007, 2008 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-whatsnew.pde-noteworthy.link-icon = images/topiclabel/wn_pluginenviro48.gif
-whatsnew.pde-noteworthy.hover-icon = images/topiclabel/wn_pluginenviro48_hov.gif

diff --git a/ui/org.eclipse.pde/intro/overviewExtensionContent.xml b/ui/org.eclipse.pde/intro/overviewExtensionContent.xml
deleted file mode 100644
index 7a8cb46..0000000
--- a/ui/org.eclipse.pde/intro/overviewExtensionContent.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<introContent>
-  <!-- Extension to the SDK Overview Page. -->
-  <extensionContent id="org.eclipse.pde" name="PDE" alt-style="css/overview.properties" style="css/overview.css" path="overview/@">
-    <group style-id="content-group" id="content-group">
-    	<link style-id="content-link" label="Eclipse plug-in development" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.pde.doc.user/guide/intro/pde_overview.htm" id="pde">
-      		<text>Learn how to extend Eclipse by building new plug-ins</text>
-    	</link>
-    </group>
-  </extensionContent>
-</introContent>

diff --git a/ui/org.eclipse.pde/intro/samplesExtensionContent.xml b/ui/org.eclipse.pde/intro/samplesExtensionContent.xml
deleted file mode 100644
index 777ded0..0000000
--- a/ui/org.eclipse.pde/intro/samplesExtensionContent.xml
+++ /dev/null

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<introContent>
-  <!-- Extension to the SDK Samples Page. -->
-  <extensionContent id="org.eclipse.pde.swt" name= "SWT samples" alt-style="css/samples.properties" style="css/samples.css" path="samples/@">
-     <group label="SWT" id="swt" style-id="content-group">
-     	<text style-id="group-description">Run SWT samples using either the standalone SWT launcher or as an integrated workbench view.</text>
-        <link label="Workbench views and standalone applications" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.internal.ui.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.swt.examples" id="swt-examples" style-id="content-link">
-        	<text>The SWT Example launcher will allow you to launch a collection of SWT examples.  Some of the examples can be run independent of the eclipse platform and others will be available as views inside the workbench.</text>
-		</link>
-        <anchor id="swtGroupAnchor"/>
-     </group>
-  </extensionContent>
-</introContent>

diff --git a/ui/org.eclipse.pde/intro/samplesExtensionContent2.xml b/ui/org.eclipse.pde/intro/samplesExtensionContent2.xml
deleted file mode 100644
index 4e1610f..0000000
--- a/ui/org.eclipse.pde/intro/samplesExtensionContent2.xml
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<introContent>
-  <!-- Extension to the SDK Samples Page. -->
-  <extensionContent id="org.eclipse.pde.workbench" name= "Workbench samples" alt-style="css/samples.properties" style="css/samples.css" path="samples/@">
-	<group label="Workbench" id="workbench" style-id="content-group">
-    	<text style-id="group-description">The following samples demonstrate how to tightly integrate into the Eclipse workbench.</text>
-        <link label="Multi-page editor" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.internal.ui.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.multipageeditor" id="multi-page-editor" style-id="content-link">
-           	<text>Shows how to create an editor with multiple pages</text>
-        </link>
-        <link label="Property sheet and outline" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.internal.ui.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.propertysheet" id="property-sheet" style-id="content-link">
-            <text>Demonstrates how to use property sheet and outline views</text>
-        </link>
-        <link label="Readme tool" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.internal.ui.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.readmetool" id="readmetool" style-id="content-link">
-            <text>Shows how to create your own extension points</text>
-        </link>
-        <anchor id="jdtAnchor"/>
-        <anchor id="workbenchGroupAnchor"/>
-	</group>
-  </extensionContent>
-</introContent>

diff --git a/ui/org.eclipse.pde/intro/tutorialsExtensionContent.xml b/ui/org.eclipse.pde/intro/tutorialsExtensionContent.xml
deleted file mode 100644
index 625846e..0000000
--- a/ui/org.eclipse.pde/intro/tutorialsExtensionContent.xml
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<introContent>
-  <!-- Extension to the SDK Tutorial Page. -->
-  <extensionContent id="org.eclipse.pde" name="PDE" alt-style="css/tutorials.properties" style="css/tutorials.css" path="tutorials/@">
-    <group label="Eclipse Plug-in Development" id="pde" style-id="content-group">
-      <link url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.pde.helloworld" 
-            label="Create an Eclipse plug-in" 
-            id="pde-hello-world" 
-            style-id="content-link">
-        <text>
-           End-to-end tutorial demonstrating how to create a plug-in, 
-           a plug-in extension, a feature, and an update site as well as 
-           how to install and uninstall a feature
-        </text>
-      </link>
-      <link url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.pde.rcpapp" 
-            label="Create a Rich Client Platform (RCP) application" 
-            id="rcp" 
-            style-id="content-link">
-        <text>
-           End-to-end tutorial demonstrating how to create a plug-in, define a 
-           plug-in based product, customize a product, export an RCP application 
-           and define a feature based product
-        </text>
-      </link>
-    </group>
-  </extensionContent>
-</introContent>

diff --git a/ui/org.eclipse.pde/intro/whatsnewExtensionContent.xml b/ui/org.eclipse.pde/intro/whatsnewExtensionContent.xml
deleted file mode 100644
index 5ba3f28..0000000
--- a/ui/org.eclipse.pde/intro/whatsnewExtensionContent.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<introContent>
-  <!-- Extension to the SDK What's New Page. -->
-  <extensionContent id="org.eclipse.pde.changes" name="Plug-in Development Environment" alt-style="css/whatsnew.properties" style="css/whatsnew.css" path="whatsnew/@">
-    <group style-id="content-group" id="content-group">
-    	<link label="Plug-in Development Environment" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.pde.doc.user/whatsNew/pde_whatsnew.htm" id="pde-noteworthy" style-id="content-link">
-      		<text>Learn about significant changes made to PDE for this release</text>
-    	</link>
-    </group>
-  </extensionContent>
-</introContent>

diff --git a/ui/org.eclipse.pde/plugin.properties b/ui/org.eclipse.pde/plugin.properties
deleted file mode 100644
index 6fc07fc..0000000
--- a/ui/org.eclipse.pde/plugin.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
-providerName=Eclipse.org
-
-#Cheatsheets  
-cheatsheet.category.pde = Plug-in Development
-
-cheatsheet.helloworld.name = Creating an Eclipse Plug-in
-cheatsheet.helloworld.desc = This cheat sheet helps you to create a plug-in, a plug-in extension, a feature and an update site using PDE.  \
-It also helps you install and uninstall a feature using Install/Update.
-
-cheatsheet.rcpapp.name = Creating a Rich Client Application
-cheatsheet.rcpapp.desc = This cheat sheet helps you to create, define, test and export a fully-branded standalone RCP product.
-
-cheatsheet.apitools.setupexisting.name = Set up API Tools on Existing Projects
-cheatsheet.apitools.setupexisting.description = This cheat sheet will help you set up API Tools on existing projects in your workspace.
\ No newline at end of file

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?><!--
-     Copyright (c) 2005, 2009 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.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>
-
-   <extension
-         point="org.eclipse.ui.intro.configExtension">
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig" 
-            content="$nl$/intro/overviewExtensionContent.xml"/>  
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/tutorialsExtensionContent.xml"/>
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/samplesExtensionContent.xml"/>
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/samplesExtensionContent2.xml"/>
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="$nl$/intro/whatsnewExtensionContent.xml"/> 
-   </extension>
-
-   <extension 
-   		 point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-      <category
-            id="org.eclipse.pde"
-            name="%cheatsheet.category.pde"/>
-      <cheatsheet
-            category="org.eclipse.pde"
-            composite="true"
-            contentFile="$nl$/cheatsheets/helloworld-composite.xml"
-            id="org.eclipse.pde.helloworld"
-            name="%cheatsheet.helloworld.name">
-         <description>%cheatsheet.helloworld.desc</description>
-      </cheatsheet>
-      <cheatsheet
-            category="org.eclipse.pde"
-            composite="true"
-            contentFile="$nl$/cheatsheets/rcpapp-composite.xml"
-            id="org.eclipse.pde.rcpapp"
-            name="%cheatsheet.rcpapp.name">
-         <description>
-            %cheatsheet.rcpapp.desc
-         </description>
-      </cheatsheet>
-      <cheatsheet
-            category="org.eclipse.pde"
-            composite="false"
-            contentFile="cheatsheets/setup-apitools-existing-projects.xml"
-            id="org.eclipse.pde.cheatsheet.setup.apitools.existing"
-            name="%cheatsheet.apitools.setupexisting.name">
-         <description>
-            %cheatsheet.apitools.setupexisting.description
-         </description>
-      </cheatsheet>
-   </extension>
-   
-</plugin>

diff --git a/ui/org.eclipse.ui.views.log/.classpath b/ui/org.eclipse.ui.views.log/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/ui/org.eclipse.ui.views.log/.classpath
+++ /dev/null

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

diff --git a/ui/org.eclipse.ui.views.log/.project b/ui/org.eclipse.ui.views.log/.project
deleted file mode 100644
index 8de6b90..0000000
--- a/ui/org.eclipse.ui.views.log/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ui.views.log</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.ui.views.log/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1a4cdbd..0000000
--- a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.core.resources.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Fri Oct 20 13:22:13 EDT 2006
-eclipse.preferences.version=1
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/default.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/implied.permissions=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/osname.aliases=UTF-8
-encoding//core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases=UTF-8
-encoding/<project>=ISO-8859-1

diff --git a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 10c4d00..0000000
--- a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,352 +0,0 @@
-#Wed Jan 02 10:20:52 CST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-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=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 50b778b..0000000
--- a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Sun Dec 30 18:01:47 CST 2007
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.overrideannotation=false
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.ui.views.log/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index c9c76e6..0000000
--- a/ui/org.eclipse.ui.views.log/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,28 +0,0 @@
-#Mon Dec 14 12:09:28 CST 2009
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.missing.output=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=0
-compilers.p.missing-version-export-package=2
-compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1

diff --git a/ui/org.eclipse.ui.views.log/META-INF/MANIFEST.MF b/ui/org.eclipse.ui.views.log/META-INF/MANIFEST.MF
deleted file mode 100644
index 9837102..0000000
--- a/ui/org.eclipse.ui.views.log/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %name
-Bundle-SymbolicName: org.eclipse.ui.views.log;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Activator: org.eclipse.ui.internal.views.log.Activator
-Bundle-Vendor: %provider-name
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
- org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";resolution:=optional
-Import-Package: com.ibm.icu.text
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ui.internal.views.log;x-friends:="org.eclipse.pde.ui"
-Bundle-ActivationPolicy: lazy

diff --git a/ui/org.eclipse.ui.views.log/about.html b/ui/org.eclipse.ui.views.log/about.html
deleted file mode 100644
index 4602330..0000000
--- a/ui/org.eclipse.ui.views.log/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</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
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.ui.views.log/build.properties b/ui/org.eclipse.ui.views.log/build.properties
deleted file mode 100644
index a204574..0000000
--- a/ui/org.eclipse.ui.views.log/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-#  Copyright (c) 2005, 2007 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.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/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               about.html
-src.includes = about.html

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/ui/org.eclipse.ui.views.log/icons/obj16/hierarchical.gif b/ui/org.eclipse.ui.views.log/icons/obj16/hierarchical.gif
deleted file mode 100644
index 2344861..0000000
--- a/ui/org.eclipse.ui.views.log/icons/obj16/hierarchical.gif
+++ /dev/null
Binary files differ

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

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

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

diff --git a/ui/org.eclipse.ui.views.log/plugin.properties b/ui/org.eclipse.ui.views.log/plugin.properties
deleted file mode 100644
index cdd1396..0000000
--- a/ui/org.eclipse.ui.views.log/plugin.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2008 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-name = Log View
-provider-name = Eclipse.org
-
-views.errorLog.name= Error Log
-content-type.name.log = Runtime log files
-

diff --git a/ui/org.eclipse.ui.views.log/plugin.xml b/ui/org.eclipse.ui.views.log/plugin.xml
deleted file mode 100644
index f492263..0000000
--- a/ui/org.eclipse.ui.views.log/plugin.xml
+++ /dev/null

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?><!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.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>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%views.errorLog.name"
-            icon="$nl$/icons/eview16/error_log.gif"
-            category="org.eclipse.ui"
-            class="org.eclipse.ui.internal.views.log.LogView"
-            id="org.eclipse.pde.runtime.LogView">
-      </view>
-   </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.pde.ui.PDEPerspective">
-         <viewShortcut
-               id="org.eclipse.pde.runtime.LogView">
-         </viewShortcut>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.eclipse.ui.views.showView"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M2+M3+Q L">
-         <parameter
-               id="org.eclipse.ui.views.showView.viewId"
-               value="org.eclipse.pde.runtime.LogView">
-         </parameter>
-      </key>
-      <key
-            platform="carbon"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M2+M3+Q L">
-      </key>
-      <key
-            platform="carbon"
-            commandId="org.eclipse.ui.views.showView"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M1+M3+Q L">
-         <parameter
-               id="org.eclipse.ui.views.showView.viewId"
-               value="org.eclipse.pde.runtime.LogView">
-         </parameter>
-      </key>
-   </extension>
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-       <content-type
-            base-type="org.eclipse.core.runtime.text"
-            file-extensions="log"
-            id="log"
-            name="%content-type.name.log"
-            priority="high">
-      </content-type>
-   </extension>
-</plugin>

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/AbstractEntry.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/AbstractEntry.java
deleted file mode 100644
index e943926..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/AbstractEntry.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 207344
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-/**
- * Everything that appears in LogView is Abstract Entry. It provides composite pattern.
- */
-public abstract class AbstractEntry extends PlatformObject implements IWorkbenchAdapter {
-
-	/**
-	 * The collection of direct children of this entry
-	 */
-	private List children = new ArrayList();
-	protected Object parent;
-
-	/**
-	 * Adds the specified child entry to the listing of children.
-	 * If the specified child is <code>null</code>, no work is done
-	 * 
-	 * @param child
-	 */
-	public void addChild(AbstractEntry child) {
-		if (child != null) {
-			children.add(0, child);
-			child.setParent(this);
-		}
-	}
-
-	/**
-	 * @see IWorkbenchAdapter#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parent) {
-		return children.toArray();
-	}
-
-	/**
-	 * @return true if this entry has children, false otherwise
-	 */
-	public boolean hasChildren() {
-		return children.size() > 0;
-	}
-
-	/**
-	 * @return the size of the child array
-	 * 
-	 * TODO rename to getChildCount(), or something more meaningful
-	 */
-	public int size() {
-		return children.size();
-	}
-
-	/**
-	 * @see IWorkbenchAdapter#getImageDescriptor(Object)
-	 */
-	public ImageDescriptor getImageDescriptor(Object object) {
-		return null;
-	}
-
-	/**
-	 * @see IWorkbenchAdapter#getLabel(Object)
-	 */
-	public String getLabel(Object o) {
-		return null;
-	}
-
-	/**
-	 * @see IWorkbenchAdapter#getParent(Object)
-	 */
-	public Object getParent(Object o) {
-		return parent;
-	}
-
-	/**
-	 * Sets the parent of this entry
-	 * @param parent
-	 */
-	public void setParent(AbstractEntry parent) {
-		this.parent = parent;
-	}
-
-	/**
-	 * removes all of the children specified in the given listing
-	 * 
-	 * @param list the list of children to remove
-	 */
-	public void removeChildren(List list) {
-		children.removeAll(list);
-	}
-
-	/**
-	 * Removes all of the children from this entry
-	 */
-	public void removeAllChildren() {
-		children.clear();
-	}
-
-	/**
-	 * Writes this entry information into the given {@link PrintWriter}
-	 * 
-	 * @param writer
-	 */
-	public abstract void write(PrintWriter writer);
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Activator.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Activator.java
deleted file mode 100644
index 0c25f73..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Activator.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 202583
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ui.views.log"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() { // do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	protected void initializeImageRegistry(ImageRegistry registry) {
-		registry.put(SharedImages.DESC_PREV_EVENT, createImageDescriptor(SharedImages.DESC_PREV_EVENT));
-		registry.put(SharedImages.DESC_NEXT_EVENT, createImageDescriptor(SharedImages.DESC_NEXT_EVENT));
-
-		registry.put(SharedImages.DESC_ERROR_ST_OBJ, createImageDescriptor(SharedImages.DESC_ERROR_ST_OBJ));
-		registry.put(SharedImages.DESC_ERROR_STACK_OBJ, createImageDescriptor(SharedImages.DESC_ERROR_STACK_OBJ));
-		registry.put(SharedImages.DESC_INFO_ST_OBJ, createImageDescriptor(SharedImages.DESC_INFO_ST_OBJ));
-		registry.put(SharedImages.DESC_OK_ST_OBJ, createImageDescriptor(SharedImages.DESC_OK_ST_OBJ));
-		registry.put(SharedImages.DESC_WARNING_ST_OBJ, createImageDescriptor(SharedImages.DESC_WARNING_ST_OBJ));
-		registry.put(SharedImages.DESC_HIERARCHICAL_LAYOUT_OBJ, createImageDescriptor(SharedImages.DESC_HIERARCHICAL_LAYOUT_OBJ));
-
-		registry.put(SharedImages.DESC_CLEAR, createImageDescriptor(SharedImages.DESC_CLEAR));
-		registry.put(SharedImages.DESC_CLEAR_DISABLED, createImageDescriptor(SharedImages.DESC_CLEAR_DISABLED));
-		registry.put(SharedImages.DESC_REMOVE_LOG, createImageDescriptor(SharedImages.DESC_REMOVE_LOG));
-		registry.put(SharedImages.DESC_REMOVE_LOG_DISABLED, createImageDescriptor(SharedImages.DESC_REMOVE_LOG_DISABLED));
-		registry.put(SharedImages.DESC_EXPORT, createImageDescriptor(SharedImages.DESC_EXPORT));
-		registry.put(SharedImages.DESC_EXPORT_DISABLED, createImageDescriptor(SharedImages.DESC_EXPORT_DISABLED));
-		registry.put(SharedImages.DESC_FILTER, createImageDescriptor(SharedImages.DESC_FILTER));
-		registry.put(SharedImages.DESC_FILTER_DISABLED, createImageDescriptor(SharedImages.DESC_FILTER_DISABLED));
-		registry.put(SharedImages.DESC_IMPORT, createImageDescriptor(SharedImages.DESC_IMPORT));
-		registry.put(SharedImages.DESC_IMPORT_DISABLED, createImageDescriptor(SharedImages.DESC_IMPORT_DISABLED));
-		registry.put(SharedImages.DESC_OPEN_LOG, createImageDescriptor(SharedImages.DESC_OPEN_LOG));
-		registry.put(SharedImages.DESC_OPEN_LOG_DISABLED, createImageDescriptor(SharedImages.DESC_OPEN_LOG_DISABLED));
-		registry.put(SharedImages.DESC_PROPERTIES, createImageDescriptor(SharedImages.DESC_PROPERTIES));
-		registry.put(SharedImages.DESC_PROPERTIES_DISABLED, createImageDescriptor(SharedImages.DESC_PROPERTIES_DISABLED));
-		registry.put(SharedImages.DESC_READ_LOG, createImageDescriptor(SharedImages.DESC_READ_LOG));
-		registry.put(SharedImages.DESC_READ_LOG_DISABLED, createImageDescriptor(SharedImages.DESC_READ_LOG_DISABLED));
-	}
-
-	private ImageDescriptor createImageDescriptor(String id) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, id);
-	}
-
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java
deleted file mode 100644
index 69ec5cc..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialog.java
+++ /dev/null

@@ -1,842 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 207466, 207344
- *     Remy Chi Jian Suen <remy.suen@gmail.com> - bug 272985
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import com.ibm.icu.text.DateFormat;
-import java.io.*;
-import java.text.Collator;
-import java.util.*;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-
-/**
- * Displays details about Log Entry.
- * Event information is split in three sections: details, stack trace and session. Details
- * contain event date, message and severity. Stack trace is displayed if an exception is bound
- * to event. Stack trace entries can be filtered.
- */
-public class EventDetailsDialog extends TrayDialog {
-
-	public static final String FILTER_ENABLED = "detailsStackFilterEnabled"; //$NON-NLS-1$
-	public static final String FILTER_LIST = "detailsStackFilterList"; //$NON-NLS-1$
-
-	private IMemento memento;
-
-	private AbstractEntry entry;
-	private AbstractEntry parentEntry; // parent of the entry
-	private AbstractEntry[] entryChildren; // children of the entry
-
-	private LogViewLabelProvider labelProvider;
-	private TreeViewer provider;
-
-	private static int COPY_ID = 22;
-
-	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 SashForm sashForm;
-
-	// sorting
-	private Comparator comparator = null;
-	Collator collator;
-
-	// patterns for filtering stack traces
-	private String[] stackFilterPatterns = null;
-
-	// location configuration
-	private Point dialogLocation;
-	private Point dialogSize;
-	private int[] sashWeights;
-
-	private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-
-	/**
-	 * 
-	 * @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, IMemento memento) {
-		super(parentShell);
-		this.provider = (TreeViewer) provider;
-		labelProvider = (LogViewLabelProvider) this.provider.getLabelProvider();
-		labelProvider.connect(this);
-		this.entry = (AbstractEntry) selection;
-		this.comparator = comparator;
-		this.memento = memento;
-		setShellStyle(SWT.MODELESS | SWT.MIN | SWT.MAX | SWT.RESIZE | SWT.CLOSE | SWT.BORDER | SWT.TITLE);
-		clipboard = new Clipboard(parentShell.getDisplay());
-		initialize();
-		collator = Collator.getInstance();
-		readConfiguration();
-		isLastChild = false;
-		isAtEndOfLog = false;
-		stackFilterPatterns = getFilters();
-	}
-
-	/*
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.LOG_EVENTDETAILS);
-	}
-
-	private void initialize() {
-		parentEntry = (AbstractEntry) entry.getParent(entry);
-		if (isChild(entry)) {
-			setEntryChildren(parentEntry);
-		} else {
-			setEntryChildren();
-		}
-		resetChildIndex();
-		isLastChild = false;
-		isAtEndOfLog = false;
-	}
-
-	private void resetChildIndex() {
-		if (entryChildren == null)
-			return;
-
-		LogEntry thisEntry = (LogEntry) entry;
-
-		for (int i = 0; i < entryChildren.length; i++) {
-			if (entryChildren[i] instanceof LogEntry) {
-
-				LogEntry logEntry = (LogEntry) entryChildren[i];
-
-				if (logEntry == thisEntry) {
-					childIndex = i;
-					return;
-				}
-			}
-		}
-
-		childIndex = 0;
-	}
-
-	private boolean isChild(AbstractEntry 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() {
-		if (clipboard != null) {
-			clipboard.dispose();
-			clipboard = null;
-		}
-		storeSettings();
-		isOpen = false;
-		labelProvider.disconnect(this);
-		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 (childIndex > 0) {
-			if (isLastChild && (isChild(entry))) {
-				setEntryChildren(parentEntry);
-				isLastChild = false;
-			}
-			childIndex--;
-			entry = entryChildren[childIndex];
-		} else {
-			if (parentEntry instanceof LogEntry) {
-				entry = parentEntry;
-				if (isChild(entry)) {
-					setEntryChildren((AbstractEntry) entry.getParent(entry));
-				} else {
-					setEntryChildren();
-				}
-				resetChildIndex();
-			}
-		}
-		setEntrySelectionInTable();
-	}
-
-	protected void nextPressed() {
-		if (childIndex < entryChildren.length - 1) {
-			childIndex++;
-			entry = entryChildren[childIndex];
-			isLastChild = childIndex == entryChildren.length - 1;
-		} else if (isChild(entry) && isLastChild && !isAtEndOfLog) {
-			findNextSelectedChild(entry);
-		} 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) { // do nothing
-		}
-		// 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) {
-					Date date1 = ((LogEntry) e1).getDate();
-					Date date2 = ((LogEntry) e2).getDate();
-					if (sortOrder == LogView.ASCENDING)
-						return date1.getTime() < date2.getTime() ? LogView.DESCENDING : LogView.ASCENDING;
-					return date1.getTime() > date2.getTime() ? LogView.DESCENDING : LogView.ASCENDING;
-				}
-			};
-		} 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)) {
-			updateProperties();
-			return;
-		}
-		if (selectedEntry instanceof AbstractEntry) {
-			entry = (AbstractEntry) 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 = (AbstractEntry) entry.getParent(entry);
-			setEntryChildren(parentEntry);
-			resetChildIndex();
-			if (childIndex == entryChildren.length - 1)
-				isLastChild = true;
-		}
-
-		if (entry instanceof LogEntry) {
-			LogEntry logEntry = (LogEntry) entry;
-
-			String strDate = dateFormat.format(logEntry.getDate());
-			dateLabel.setText(strDate);
-			severityImageLabel.setImage(labelProvider.getColumnImage(entry, 0));
-			severityLabel.setText(logEntry.getSeverityText());
-			msgText.setText(logEntry.getMessage() != null ? logEntry.getMessage() : ""); //$NON-NLS-1$
-			String stack = logEntry.getStack();
-
-			if (stack != null) {
-				stack = filterStack(stack);
-				stackTraceText.setText(stack);
-			} else {
-				stackTraceText.setText(Messages.EventDetailsDialog_noStack);
-			}
-
-			if (logEntry.getSession() != null) {
-				String session = logEntry.getSession().getSessionData();
-				if (session != null) {
-					sessionDataText.setText(session);
-				}
-			}
-
-		} else {
-			dateLabel.setText(""); //$NON-NLS-1$
-			severityImageLabel.setImage(null);
-			severityLabel.setText(""); //$NON-NLS-1$
-			msgText.setText(""); //$NON-NLS-1$
-			stackTraceText.setText(""); //$NON-NLS-1$
-			sessionDataText.setText(""); //$NON-NLS-1$
-		}
-
-		updateButtons();
-	}
-
-	private void updateButtons() {
-		boolean isAtEnd = childIndex == entryChildren.length - 1;
-		if (isChild(entry)) {
-			boolean canGoToParent = (entry.getParent(entry) instanceof LogEntry);
-			backButton.setEnabled((childIndex > 0) || canGoToParent);
-			nextButton.setEnabled(nextChildExists(entry, parentEntry, entryChildren) || entry.hasChildren() || !isLastChild || !isAtEnd);
-		} else {
-			backButton.setEnabled(childIndex != 0);
-			nextButton.setEnabled(!isAtEnd || entry.hasChildren());
-		}
-	}
-
-	private void findNextSelectedChild(AbstractEntry 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((AbstractEntry) parentEntry.getParent(parentEntry));
-			parentEntry = (AbstractEntry) parentEntry.getParent(parentEntry);
-			resetChildIndex();
-			isLastChild = childIndex == entryChildren.length - 1;
-			if (isLastChild) {
-				findNextSelectedChild(originalEntry);
-			} else {
-				nextPressed();
-			}
-		} else if (parentEntry instanceof LogEntry) {
-			entry = parentEntry;
-			setEntryChildren();
-			resetChildIndex();
-			isLastChild = childIndex == entryChildren.length - 1;
-			if (isLastChild) {
-				if (isChild(entry)) {
-					findNextSelectedChild(originalEntry);
-				} else {
-					entry = originalEntry;
-					isAtEndOfLog = true;
-					nextPressed();
-				}
-			} else {
-				nextPressed();
-			}
-		} else {
-			entry = originalEntry;
-			isAtEndOfLog = true;
-			nextPressed();
-		}
-	}
-
-	private boolean nextChildExists(AbstractEntry originalEntry, AbstractEntry originalParent, AbstractEntry[] 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;
-			parentEntry = (AbstractEntry) entry.getParent(entry);
-			setEntryChildren(parentEntry);
-			resetChildIndex();
-			if (childIndex == entryChildren.length - 1) {
-				return nextChildExists(originalEntry, originalParent, originalEntries);
-			}
-			entry = originalEntry;
-			parentEntry = originalParent;
-			entryChildren = originalEntries;
-			resetChildIndex();
-			return true;
-		} else if (parentEntry instanceof LogEntry) {
-			entry = parentEntry;
-			setEntryChildren();
-			childIndex = -1;
-			resetChildIndex();
-			if ((childIndex != -1) && (childIndex < entryChildren.length - 1)) {
-				entry = originalEntry;
-				parentEntry = originalParent;
-				entryChildren = originalEntries;
-				resetChildIndex();
-				return true;
-			}
-		}
-		entry = originalEntry;
-		parentEntry = originalParent;
-		entryChildren = originalEntries;
-		resetChildIndex();
-		return false;
-
-	}
-
-	/**
-	 * Sets entry children (Prev-Next navigable) to top-level elements
-	 */
-	private void setEntryChildren() {
-		AbstractEntry[] children = getElements();
-
-		if (comparator != null)
-			Arrays.sort(children, comparator);
-		entryChildren = new AbstractEntry[children.length];
-
-		System.arraycopy(children, 0, entryChildren, 0, children.length);
-	}
-
-	/**
-	 * Sets entry children (Prev-Next navigable) to children of given entry
-	 */
-	private void setEntryChildren(AbstractEntry entry) {
-		Object[] children = entry.getChildren(entry);
-
-		if (comparator != null)
-			Arrays.sort(children, comparator);
-
-		List result = new ArrayList();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i] instanceof AbstractEntry) {
-				result.add(children[i]);
-			}
-		}
-
-		entryChildren = (AbstractEntry[]) result.toArray(new AbstractEntry[result.size()]);
-	}
-
-	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));
-		((GridData) comp.getLayoutData()).verticalAlignment = SWT.BOTTOM;
-
-		Composite container = new Composite(comp, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		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);
-		backButton.setLayoutData(gd);
-		backButton.setToolTipText(Messages.EventDetailsDialog_previous);
-		backButton.setImage(SharedImages.getImage(SharedImages.DESC_PREV_EVENT));
-		backButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				e.result = Messages.EventDetailsDialog_previous;
-			}
-		});
-
-		copyButton = createButton(container, COPY_ID, "", false); //$NON-NLS-1$
-		gd = new GridData();
-		copyButton.setLayoutData(gd);
-		copyButton.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_COPY));
-		copyButton.setToolTipText(Messages.EventDetailsDialog_copy);
-		copyButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				e.result = Messages.EventDetailsDialog_copy;
-			}
-		});
-
-		nextButton = createButton(container, IDialogConstants.NEXT_ID, "", false); //$NON-NLS-1$
-		gd = new GridData();
-		nextButton.setLayoutData(gd);
-		nextButton.setToolTipText(Messages.EventDetailsDialog_next);
-		nextButton.setImage(SharedImages.getImage(SharedImages.DESC_NEXT_EVENT));
-		nextButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				e.result = Messages.EventDetailsDialog_next;
-			}
-		});
-
-		Button button = new Button(container, SWT.NONE);
-		button.setToolTipText(Messages.EventDetailsDialog_ShowFilterDialog);
-		button.setImage(SharedImages.getImage(SharedImages.DESC_FILTER));
-		gd = new GridData();
-		gd.horizontalAlignment = SWT.RIGHT;
-		button.setLayoutData(gd);
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				FilterDialog dialog = new FilterDialog(getShell(), memento);
-				dialog.create();
-				dialog.getShell().setText(Messages.EventDetailsDialog_FilterDialog);
-				if (dialog.open() == Window.OK)
-					// update filters and currently displayed stack trace
-					stackFilterPatterns = getFilters();
-				updateProperties();
-			}
-		});
-		button.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				e.result = Messages.EventDetailsDialog_FilterDialog;
-			}
-		});
-
-		// set numColumns at the end, after all createButton() calls, which change this value
-		layout.numColumns = 2;
-	}
-
-	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.marginWidth = layout.marginHeight = 0;
-		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(Messages.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(Messages.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(Messages.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(2, false);
-		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.NONE);
-		label.setText(Messages.EventDetailsDialog_exception);
-		gd = new GridData();
-		gd.verticalAlignment = SWT.BOTTOM;
-		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;
-		gd.horizontalSpan = 2;
-		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(Messages.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);
-	}
-
-	/**
-	 * Loads filters from preferences.
-	 * @return filters from preferences or empty array
-	 * 
-	 * @since 3.4
-	 */
-	private String[] getFilters() {
-
-		Boolean filterEnabled = memento.getBoolean(FILTER_ENABLED);
-
-		String filtersString = memento.getString(FILTER_LIST);
-
-		if ((filterEnabled == null) || (filterEnabled.booleanValue() == false) || filtersString == null) {
-			return new String[0];
-		}
-
-		StringTokenizer st = new StringTokenizer(filtersString, ";"); //$NON-NLS-1$
-		List filters = new ArrayList();
-		while (st.hasMoreElements()) {
-			String filter = st.nextToken();
-			filters.add(filter);
-		}
-
-		return (String[]) filters.toArray(new String[filters.size()]);
-	}
-
-	/**
-	 * Filters stack trace.
-	 * Every stack trace line is compared against all patterns.
-	 * If line contains any of pattern strings, it's excluded from output.
-	 * 
-	 * @returns filtered stack trace
-	 * @since 3.4
-	 */
-	private String filterStack(String stack) {
-		if (stackFilterPatterns.length == 0) {
-			return stack;
-		}
-
-		StringTokenizer st = new StringTokenizer(stack, "\n"); //$NON-NLS-1$
-		StringBuffer result = new StringBuffer();
-		while (st.hasMoreTokens()) {
-			String stackElement = st.nextToken();
-
-			boolean filtered = false;
-			int i = 0;
-			while ((!filtered) && (i < stackFilterPatterns.length)) {
-				filtered = stackElement.indexOf(stackFilterPatterns[i]) >= 0;
-				i++;
-			}
-
-			if (!filtered) {
-				result.append(stackElement).append("\n"); //$NON-NLS-1$
-			}
-		}
-
-		return result.toString();
-	}
-
-	//--------------- 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 = Activator.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$
-	}
-
-	/**
-	 * Utility method to get all top level elements of the Log View
-	 * @return top level elements of the Log View
-	 */
-	private AbstractEntry[] getElements() {
-		return (AbstractEntry[]) ((ITreeContentProvider) provider.getContentProvider()).getElements(null);
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialogAction.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialogAction.java
deleted file mode 100644
index e4c577f..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/EventDetailsDialogAction.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 207344
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.util.Comparator;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.actions.SelectionProviderAction;
-
-/**
- * Opens EventDetailsDialog
- */
-public class EventDetailsDialogAction extends SelectionProviderAction {
-
-	/**
-	 * The control that the dialog should appear on top of.
-	 */
-	private Control control;
-	private ISelectionProvider provider;
-	private EventDetailsDialog propertyDialog;
-	private Comparator comparator;
-	private IMemento memento;
-
-	/**
-	 * Creates a new action for opening a property dialog
-	 * on the elements from the given selection provider
-	 * @param control - the control that the details dialog should show up on
-	 * @param provider - the selection provider whose elements
-	 * @param memento - memento with EventDetails dialog options
-	 * the property dialog will describe
-	 */
-	public EventDetailsDialogAction(Control control, ISelectionProvider provider, IMemento memento) {
-		super(provider, Messages.EventDetailsDialog_title);
-		Assert.isNotNull(control);
-		this.control = control;
-		this.provider = provider;
-		this.memento = memento;
-		// 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) || (!(element instanceof LogEntry)))
-			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) || (!(element instanceof LogEntry)))
-			return;
-
-		propertyDialog = new EventDetailsDialog(control.getShell(), element, provider, comparator, memento);
-		propertyDialog.create();
-		propertyDialog.getShell().setText(Messages.EventDetailsDialog_title);
-		propertyDialog.open();
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/FilterDialog.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/FilterDialog.java
deleted file mode 100644
index 87bb534..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/FilterDialog.java
+++ /dev/null

@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.util.StringTokenizer;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.PlatformUI;
-
-public class FilterDialog extends TrayDialog {
-
-	Button okButton;
-
-	// entries count limit
-	private Button limit;
-	Text limitText;
-
-	// entry types filter
-	private Button errorCheckbox;
-	private Button warningCheckbox;
-	private Button infoCheckbox;
-	private Button okCheckbox;
-
-	// show all sessions
-	private Button showAllButton;
-
-	// filter stack trace elements in EventDetailsDialog
-	private Button filterEnabled;
-	private Button addFilter;
-	private Button removeFilter;
-	private List filterList;
-
-	private IMemento memento;
-
-	public FilterDialog(Shell parentShell, IMemento memento) {
-		super(parentShell);
-		this.memento = memento;
-	}
-
-	/*
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.LOG_FILTER);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite) super.createDialogArea(parent);
-		createEventTypesGroup(container);
-		createLimitSection(container);
-		createSessionSection(container);
-		createFilterSection(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(Messages.LogView_FilterDialog_eventTypes);
-
-		okCheckbox = new Button(group, SWT.CHECK);
-		okCheckbox.setText(Messages.LogView_FilterDialog_ok);
-		okCheckbox.setSelection(memento.getString(LogView.P_LOG_OK).equals("true")); //$NON-NLS-1$
-
-		infoCheckbox = new Button(group, SWT.CHECK);
-		infoCheckbox.setText(Messages.LogView_FilterDialog_information);
-		infoCheckbox.setSelection(memento.getString(LogView.P_LOG_INFO).equals("true")); //$NON-NLS-1$
-
-		warningCheckbox = new Button(group, SWT.CHECK);
-		warningCheckbox.setText(Messages.LogView_FilterDialog_warning);
-		warningCheckbox.setSelection(memento.getString(LogView.P_LOG_WARNING).equals("true")); //$NON-NLS-1$
-
-		errorCheckbox = new Button(group, SWT.CHECK);
-		errorCheckbox.setText(Messages.LogView_FilterDialog_error);
-		errorCheckbox.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(Messages.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.addVerifyListener(new VerifyListener() {
-			public void verifyText(VerifyEvent e) {
-				if (Character.isLetter(e.character)) {
-					e.doit = false;
-				}
-			}
-		});
-		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(Messages.LogView_FilterDialog_eventsLogged);
-
-		showAllButton = new Button(container, SWT.RADIO);
-		showAllButton.setText(Messages.LogView_FilterDialog_allSessions);
-		GridData gd = new GridData();
-		gd.horizontalIndent = 20;
-		showAllButton.setLayoutData(gd);
-
-		Button button = new Button(container, SWT.RADIO);
-		button.setText(Messages.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);
-		}
-	}
-
-	private void createFilterSection(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		filterEnabled = new Button(comp, SWT.CHECK);
-		filterEnabled.setText(Messages.FilterDialog_EnableFiltersCheckbox);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		filterEnabled.setLayoutData(gd);
-		filterEnabled.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				setStackTraceFilterEnabled(filterEnabled.getSelection());
-			}
-
-		});
-
-		filterList = new List(comp, SWT.BORDER | SWT.MULTI);
-		gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-		gd.verticalSpan = 3;
-		gd.widthHint = 280;
-		gd.horizontalIndent = 20;
-		filterList.setLayoutData(gd);
-		filterList.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				removeFilter.setEnabled(true);
-			}
-		});
-
-		addFilter = new Button(comp, SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		addFilter.setLayoutData(gd);
-		addFilter.setText(Messages.FilterDialog_Add);
-		addFilter.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				addFilter();
-			}
-		});
-
-		removeFilter = new Button(comp, SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		removeFilter.setLayoutData(gd);
-		removeFilter.setText(Messages.FilterDialog_Remove);
-		removeFilter.setEnabled(false);
-		removeFilter.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				removeFilter();
-			}
-		});
-
-		// load preferences
-		Boolean enable = memento.getBoolean(EventDetailsDialog.FILTER_ENABLED);
-		enable = enable == null ? Boolean.FALSE : enable;
-
-		filterEnabled.setSelection(enable.booleanValue());
-		setStackTraceFilterEnabled(enable.booleanValue());
-
-		String filters = memento.getString(EventDetailsDialog.FILTER_LIST);
-		if (filters != null) {
-			StringTokenizer st = new StringTokenizer(filters, ";"); //$NON-NLS-1$
-			while (st.hasMoreElements()) {
-				filterList.add(st.nextToken());
-			}
-		}
-	}
-
-	private void addFilter() {
-		IInputValidator validator = new IInputValidator() {
-
-			public String isValid(String newText) {
-				return newText.indexOf(';') >= 0 ? Messages.FilterDialog_FilterShouldntContainSemicolon : null;
-			}
-
-		};
-		InputDialog dialog = new InputDialog(getShell(), Messages.FilterDialog_AddFilterTitle, Messages.FilterDialog_AddFliterLabel, null, validator);
-		if (dialog.open() == Window.OK) {
-			String value = dialog.getValue().trim();
-
-			if (value.length() > 0) {
-				filterList.add(value);
-			}
-		}
-	}
-
-	private void removeFilter() {
-		String[] selected = filterList.getSelection();
-		for (int i = 0; i < selected.length; i++) {
-			filterList.remove(selected[i]);
-		}
-		removeFilter.setEnabled(false);
-	}
-
-	private void setStackTraceFilterEnabled(boolean enabled) {
-		filterList.setEnabled(enabled);
-		addFilter.setEnabled(enabled);
-		removeFilter.setEnabled(enabled && filterList.getSelectionIndex() != -1);
-	}
-
-	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_OK, okCheckbox.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putString(LogView.P_LOG_INFO, infoCheckbox.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putString(LogView.P_LOG_WARNING, warningCheckbox.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putString(LogView.P_LOG_ERROR, errorCheckbox.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$
-
-		// store Event Dialog stack trace filter preferences
-		memento.putBoolean(EventDetailsDialog.FILTER_ENABLED, filterEnabled.getSelection());
-
-		StringBuffer sb = new StringBuffer();
-		String[] items = filterList.getItems();
-		for (int i = 0; i < items.length; i++) {
-			sb.append(items[i]);
-			if (i < items.length - 1) {
-				sb.append(";"); //$NON-NLS-1$
-			}
-		}
-		memento.putString(EventDetailsDialog.FILTER_LIST, sb.toString());
-
-		super.okPressed();
-	}
-
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Group.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Group.java
deleted file mode 100644
index db9175d..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Group.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 207344
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 218648 
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.io.PrintWriter;
-
-/**
- * Groups other Abstract Entries under given name.
- */
-public class Group extends AbstractEntry {
-
-	private String name;
-
-	public Group(String name) {
-		this.name = name;
-	}
-
-	public void write(PrintWriter writer) {
-		Object[] children = getChildren(null);
-		for (int i = 0; i < children.length; i++) {
-			AbstractEntry entry = (AbstractEntry) children[i];
-			entry.write(writer);
-			writer.println();
-		}
-	}
-
-	public String toString() {
-		return name;
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/IHelpContextIds.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/IHelpContextIds.java
deleted file mode 100644
index 5f31abd..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/IHelpContextIds.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2008 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-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 LOG_EVENTDETAILS = PREFIX + "log_eventdetails"; //$NON-NLS-1$
-	public static final String LOG_FILTER = PREFIX + "log_filter"; //$NON-NLS-1$
-
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ILogFileProvider.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ILogFileProvider.java
deleted file mode 100644
index 0b9d03b..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ILogFileProvider.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.util.Map;
-
-/**
- * Provides log files.
- */
-public interface ILogFileProvider {
-
-	/**
-	 * Returns a Map of java.io.File log files indexed by String names.
-	 * 
-	 * @return Map of java.io.File log files index by String names.
-	 * @since 3.4
-	 */
-	Map getLogSources();
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ImportLogAction.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ImportLogAction.java
deleted file mode 100644
index 820a152..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/ImportLogAction.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 218293
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.util.*;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.*;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IMemento;
-
-/**
- * Imports log to Log View from such sources as file in local file system, file in workspace,
- * files from log files manager.
- */
-public class ImportLogAction extends Action implements IMenuCreator {
-
-	private Menu toolbarMenu = null;
-	private Menu popupMenu = null;
-
-	/**
-	 * View to import logs to.
-	 */
-	private final LogView logView;
-	private ImportConfigurationLogAction[] actions;
-	private IMemento fMemento;
-
-	/**
-	 * Action imports log file from given location to Log View.
-	 */
-	private class ImportConfigurationLogAction extends Action {
-		private String name;
-		private String location;
-
-		public ImportConfigurationLogAction(String name, String location) {
-			super(name, AS_RADIO_BUTTON);
-			this.name = name;
-			this.location = location;
-			setId(name + "#" + location); //$NON-NLS-1$
-		}
-
-		protected void doRun() {
-			logView.handleImportPath(location);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.action.Action#run()
-		 */
-		public void run() {
-			doRun();
-
-			// remember we clicked on that item
-			if (isChecked()) {
-				fMemento.putString(LogView.P_IMPORT_LOG, getId());
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object o) {
-			if (o instanceof ImportConfigurationLogAction) {
-				ImportConfigurationLogAction action = (ImportConfigurationLogAction) o;
-				return name.equals(action.name) && location.equals(action.name);
-			}
-
-			return false;
-		}
-	}
-
-	public ImportLogAction(LogView logView, String text, IMemento memento) {
-		super(text);
-		this.logView = logView;
-		this.fMemento = memento;
-		setMenuCreator(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		// by default import file selected by user
-		logView.handleImport();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-	 */
-	public Menu getMenu(Control parent) {
-		if (menuUpdateNeeded(toolbarMenu)) {
-			toolbarMenu = new Menu(parent);
-			createMenuItems(toolbarMenu);
-		}
-		return toolbarMenu;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-	 */
-	public Menu getMenu(Menu parent) {
-		if (menuUpdateNeeded(popupMenu)) {
-			popupMenu = new Menu(parent);
-			createMenuItems(popupMenu);
-		}
-		return popupMenu;
-	}
-
-	/**
-	 * Returns whether menu should be updated or not. Menu should be updated
-	 * if either number of actions or any of actions has been changed. 
-	 * @return true if menu should be updated, false otherwise
-	 */
-	private boolean menuUpdateNeeded(Menu menu) {
-		boolean result = false;
-
-		ImportConfigurationLogAction[] currActions = getLogActions();
-
-		if (menu == null) {
-			result = true;
-		} else if (actions == null) {
-			result = true;
-		} else if (currActions.length != actions.length) {
-			result = true;
-		} else {
-			for (int i = 0; i < currActions.length; i++) {
-				if (!currActions[i].equals(actions[i])) {
-					result = true;
-				}
-			}
-		}
-
-		if (result == true) {
-			actions = currActions;
-
-			if (toolbarMenu != null) {
-				toolbarMenu.dispose();
-				toolbarMenu = null;
-			}
-			if (popupMenu != null) {
-				popupMenu.dispose();
-				popupMenu = null;
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Returns list of all actions from LogFilesManager.
-	 * @return list of all actions from LogFilesManager
-	 */
-	private ImportConfigurationLogAction[] getLogActions() {
-		List result = new ArrayList();
-		Map sources = LogFilesManager.getLogSources();
-
-		for (Iterator j = sources.keySet().iterator(); j.hasNext();) {
-			String name = (String) j.next();
-			String location = (String) sources.get(name);
-			result.add(new ImportConfigurationLogAction(name, location));
-		}
-
-		return (ImportConfigurationLogAction[]) result.toArray(new ImportConfigurationLogAction[result.size()]);
-	}
-
-	/**
-	 * Builds menu of ImportLogAction actions from log files provided by LogFilesManager.
-	 * 
-	 * @see IMenuCreator#getMenu(Control)
-	 */
-	private void createMenuItems(Menu menu) {
-		String previouslyCheckedActionId = fMemento.getString(LogView.P_IMPORT_LOG);
-		if (actions.length == 0) {
-			Action action = new Action(Messages.ImportLogAction_noLaunchHistory) {
-				// dummy action
-			};
-			action.setEnabled(false);
-			ActionContributionItem actionItem = new ActionContributionItem(action);
-			actionItem.fill(menu, -1);
-		} else {
-			for (int i = 0; i < actions.length; i++) {
-				actions[i].setChecked(actions[i].getId().equals(previouslyCheckedActionId) && !logView.isPlatformLogOpen());
-				ActionContributionItem item = new ActionContributionItem(actions[i]);
-				item.fill(menu, -1);
-			}
-		}
-
-		(new Separator()).fill(menu, -1);
-		ImportConfigurationLogAction importWorkspaceLogAction = new ImportConfigurationLogAction(Messages.ImportLogAction_reloadWorkspaceLog, Platform.getLogFileLocation().toFile().getAbsolutePath()) {
-
-			public void doRun() {
-				logView.setPlatformLog();
-			}
-
-		};
-		importWorkspaceLogAction.setChecked(logView.isPlatformLogOpen());
-		ActionContributionItem item = new ActionContributionItem(importWorkspaceLogAction);
-		item.fill(menu, -1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#dispose()
-	 */
-	public void dispose() {
-		if (toolbarMenu != null) {
-			toolbarMenu.dispose();
-			toolbarMenu = null;
-		}
-		if (popupMenu != null) {
-			popupMenu.dispose();
-			popupMenu = null;
-		}
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java
deleted file mode 100644
index d9c42ec..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java
+++ /dev/null

@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 209474, 207344
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.ParseException;
-import java.util.*;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Represents a given entry in the Error view
- */
-public class LogEntry extends AbstractEntry {
-
-	public static final String SPACE = " "; //$NON-NLS-1$
-	public static final String F_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$
-	private static final DateFormat GREGORIAN_SDF = new SimpleDateFormat(F_DATE_FORMAT, Locale.ENGLISH);
-	private static final DateFormat LOCAL_SDF = new SimpleDateFormat(F_DATE_FORMAT);
-
-	private String pluginId;
-	private int severity;
-	private int code;
-	private String fDateString;
-	private Date fDate;
-	private String message;
-	private String stack;
-	private LogSession session;
-
-	/**
-	 * Constructor
-	 */
-	public LogEntry() {
-		//do nothing
-	}
-
-	/**
-	 * Constructor - creates a new entry from the given status
-	 * @param status an existing status to create a new entry from
-	 */
-	public LogEntry(IStatus status) {
-		processStatus(status);
-	}
-
-	/**
-	 * Returns the {@link LogSession} for this entry or the parent {@link LogSession}
-	 * iff:
-	 * <ul>
-	 * <li>The session is <code>null</code> for this entry</li>
-	 * <li>The parent of this entry is not <code>null</code> and is a {@link LogEntry}</li>
-	 * </ul>
-	 * @return the {@link LogSession} for this entry
-	 */
-	public LogSession getSession() {
-		if ((session == null) && (parent != null) && (parent instanceof LogEntry)) {
-			return ((LogEntry) parent).getSession();
-		}
-		return session;
-	}
-
-	/**
-	 * Sets the {@link LogSession} for this entry. No validation is done on the new session.
-	 * @param session the session to set.
-	 */
-	void setSession(LogSession session) {
-		this.session = session;
-	}
-
-	/**
-	 * Returns the severity of this entry.
-	 * @return the severity
-	 * @see IStatus#OK
-	 * @see IStatus#WARNING
-	 * @see IStatus#INFO
-	 * @see IStatus#ERROR
-	 */
-	public int getSeverity() {
-		return severity;
-	}
-
-	/**
-	 * Returns if the severity of this entry is {@link IStatus#OK}
-	 * @return if the entry is OK or not
-	 */
-	public boolean isOK() {
-		return severity == IStatus.OK;
-	}
-
-	/**
-	 * Returns the code for this entry
-	 * @return the code for this entry
-	 */
-	public int getCode() {
-		return code;
-	}
-
-	/**
-	 * Returns the id of the plugin that generated this entry
-	 * @return the plugin id of this entry
-	 */
-	public String getPluginId() {
-		return pluginId;
-	}
-
-	/**
-	 * Returns the message for this entry or <code>null</code> if there is no message
-	 * @return the message or <code>null</code>
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * Returns the stack trace for this entry or <code>null</code> if there is no stack trace
-	 * @return the stack trace or <code>null</code>
-	 */
-	public String getStack() {
-		return stack;
-	}
-
-	/**
-	 * Returns a pretty-print formatting for the date for this entry
-	 * @return the formatted date for this entry
-	 */
-	public String getFormattedDate() {
-		if (fDateString == null) {
-			fDateString = LOCAL_SDF.format(getDate());
-		}
-		return fDateString;
-	}
-
-	/**
-	 * Returns the date for this entry or the epoch if the current date value is <code>null</code>
-	 * @return the entry date or the epoch if there is no date entry
-	 */
-	public Date getDate() {
-		if (fDate == null) {
-			fDate = new Date(0); // unknown date - return epoch
-		}
-		return fDate;
-	}
-
-	/**
-	 * Returns the human-readable text representation of the integer
-	 * severity value or '<code>?</code>' if the severity is unknown.
-	 * @return the text representation of the severity
-	 */
-	public String getSeverityText() {
-		switch (severity) {
-			case IStatus.ERROR : {
-				return Messages.LogView_severity_error;
-			}
-			case IStatus.WARNING : {
-				return Messages.LogView_severity_warning;
-			}
-			case IStatus.INFO : {
-				return Messages.LogView_severity_info;
-			}
-			case IStatus.OK : {
-				return Messages.LogView_severity_ok;
-			}
-		}
-		return "?"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getSeverityText();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.internal.views.log.AbstractEntry#getLabel(java.lang.Object)
-	 */
-	public String getLabel(Object obj) {
-		return getSeverityText();
-	}
-
-	/**
-	 * Processes a given line from the log file
-	 * @param line
-	 * @throws ParseException
-	 */
-	public void processEntry(String line) throws ParseException {
-		//!ENTRY <pluginID> <severity> <code> <date>
-		//!ENTRY <pluginID> <date> if logged by the framework!!!
-		StringTokenizer stok = new StringTokenizer(line, SPACE);
-		severity = 0;
-		code = 0;
-		StringBuffer dateBuffer = new StringBuffer();
-		int tokens = stok.countTokens();
-		String token = null;
-		for (int i = 0; i < tokens; i++) {
-			token = stok.nextToken();
-			switch (i) {
-				case 0 : {
-					break;
-				}
-				case 1 : {
-					pluginId = token;
-					break;
-				}
-				case 2 : {
-					try {
-						severity = Integer.parseInt(token);
-					} catch (NumberFormatException nfe) {
-						appendToken(dateBuffer, token);
-					}
-					break;
-				}
-				case 3 : {
-					try {
-						code = Integer.parseInt(token);
-					} catch (NumberFormatException nfe) {
-						appendToken(dateBuffer, token);
-					}
-					break;
-				}
-				default : {
-					appendToken(dateBuffer, token);
-				}
-			}
-		}
-		Date date = GREGORIAN_SDF.parse(dateBuffer.toString());
-		if (date != null) {
-			fDate = date;
-			fDateString = LOCAL_SDF.format(fDate);
-		}
-	}
-
-	/**
-	 * Adds the given token to the given buffer, adding a space as needed
-	 * @param buffer
-	 * @param token
-	 * 
-	 * @since 3.6
-	 */
-	void appendToken(StringBuffer buffer, String token) {
-		if (buffer.length() > 0) {
-			buffer.append(SPACE);
-		}
-		buffer.append(token);
-	}
-
-	/**
-	 * Processes the given sub-entry from the log
-	 * @param line
-	 * @return the depth of the sub-entry
-	 * @throws ParseException
-	 */
-	public int processSubEntry(String line) throws ParseException {
-		//!SUBENTRY <depth> <pluginID> <severity> <code> <date>
-		//!SUBENTRY  <depth> <pluginID> <date>if logged by the framework!!!
-		StringTokenizer stok = new StringTokenizer(line, SPACE);
-		StringBuffer dateBuffer = new StringBuffer();
-		int depth = 0;
-		String token = null;
-		int tokens = stok.countTokens();
-		for (int i = 0; i < tokens; i++) {
-			token = stok.nextToken();
-			switch (i) {
-				case 0 : {
-					break;
-				}
-				case 1 : {
-					depth = Integer.parseInt(token);
-					break;
-				}
-				case 2 : {
-					pluginId = token;
-					break;
-				}
-				case 3 : {
-					try {
-						severity = Integer.parseInt(token);
-					} catch (NumberFormatException nfe) {
-						appendToken(dateBuffer, token);
-					}
-					break;
-				}
-				case 4 : {
-					try {
-						code = Integer.parseInt(token);
-					} catch (NumberFormatException nfe) {
-						appendToken(dateBuffer, token);
-					}
-					break;
-				}
-				default : {
-					appendToken(dateBuffer, token);
-				}
-			}
-		}
-		Date date = GREGORIAN_SDF.parse(dateBuffer.toString());
-		if (date != null) {
-			fDate = date;
-			fDateString = LOCAL_SDF.format(fDate);
-		}
-		return depth;
-	}
-
-	/**
-	 * Sets the stack to the given stack value. 
-	 * No validation is performed on the new value.
-	 * @param stack
-	 */
-	void setStack(String stack) {
-		this.stack = stack;
-	}
-
-	/**
-	 * Sets the message to the given message value.
-	 * No validation is performed on the new value
-	 * @param message
-	 */
-	void setMessage(String message) {
-		this.message = message;
-	}
-
-	/**
-	 * Process the given status and sub-statuses to fill this entry
-	 * @param status
-	 */
-	private void processStatus(IStatus status) {
-		pluginId = status.getPlugin();
-		severity = status.getSeverity();
-		code = status.getCode();
-		fDate = new Date();
-		fDateString = LOCAL_SDF.format(fDate);
-		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) {
-			for (int i = 0; i < schildren.length; i++) {
-				addChild(new LogEntry(schildren[i]));
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.internal.views.log.AbstractEntry#write(java.io.PrintWriter)
-	 */
-	public void write(PrintWriter writer) {
-		if (session != null) {
-			writer.println(session.getSessionData());
-		}
-		writer.println(getSeverityText());
-		if (fDate != null) {
-			writer.println(getDate());
-		}
-		if (message != null) {
-			writer.println(getMessage());
-		}
-		if (stack != null) {
-			writer.println();
-			writer.println(stack);
-		}
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogFilesManager.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogFilesManager.java
deleted file mode 100644
index 9c2af44..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogFilesManager.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.util.*;
-
-/**
- * Manages the log file providers.
- * One adds log file provider to let Log View know where to find log files.
- */
-public class LogFilesManager {
-
-	private static List logFileProviders = new ArrayList();
-
-	/**
-	 * Adds log file provider.
-	 * Has no effect if an identical provider is already registered. 
-	 */
-	public static void addLogFileProvider(ILogFileProvider provider) {
-		if (!logFileProviders.contains(provider)) {
-			logFileProviders.add(provider);
-		}
-	}
-
-	/**
-	 * Removes log file provider.
-	 * Has no effect if an identical provider is already removed.
-	 */
-	public static void removeLogFileProvider(ILogFileProvider provider) {
-		logFileProviders.remove(provider);
-	}
-
-	/**
-	 * Returns the list of logs.
-	 */
-	static Map getLogSources() {
-		ILogFileProvider[] providers = (ILogFileProvider[]) logFileProviders.toArray(new ILogFileProvider[logFileProviders.size()]);
-		Map result = new HashMap(providers.length);
-
-		for (int i = 0; i < providers.length; i++) {
-			ILogFileProvider provider = providers[i];
-
-			Map sources = provider.getLogSources();
-			result.putAll(sources);
-		}
-
-		return result;
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogReader.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogReader.java
deleted file mode 100644
index 1abcad7..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogReader.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 207061
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 207312, 100715
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 207344
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import java.io.*;
-import java.text.ParseException;
-import java.util.*;
-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;
-
-	public static LogSession parseLogFile(File file, List entries, IMemento memento) {
-		if (!file.exists())
-			return null;
-
-		if (memento.getString(LogView.P_USE_LIMIT).equals("true") //$NON-NLS-1$
-				&& memento.getInteger(LogView.P_LOG_LIMIT).intValue() == 0)
-			return null;
-
-		ArrayList parents = new ArrayList();
-		LogEntry current = null;
-		LogSession session = null;
-		int writerState = UNKNOWN_STATE;
-		StringWriter swriter = null;
-		PrintWriter writer = null;
-		int state = UNKNOWN_STATE;
-		LogSession 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.startsWith(LogSession.SESSION)) {
-					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) {
-					setData(current, session, writerState, swriter);
-					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;
-					currentSession = updateCurrentSession(currentSession, session);
-					// if current session is most recent and not showing all sessions
-					if (currentSession.equals(session) && !memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")) //$NON-NLS-1$
-						entries.clear();
-				} else if (state == ENTRY_STATE) {
-					if (currentSession == null) { // create fake session if there was no any
-						currentSession = new LogSession();
-					}
-					try {
-						LogEntry entry = new LogEntry();
-						entry.setSession(currentSession);
-						entry.processEntry(line);
-						setNewParent(parents, entry, 0);
-						current = entry;
-						addEntry(current, entries, memento);
-					} catch (ParseException pe) {
-						//do nothing, just toss the entry
-					}
-				} else if (state == SUBENTRY_STATE) {
-					if (parents.size() > 0) {
-						try {
-							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);
-						} catch (ParseException pe) {
-							//do nothing, just toss the bad 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) {
-				writerState = UNKNOWN_STATE;
-				current.setStack(swriter.toString());
-			}
-		} catch (FileNotFoundException e) { // do nothing
-		} catch (IOException e) { // do nothing
-		} finally {
-			try {
-				if (reader != null)
-					reader.close();
-			} catch (IOException e1) { // do nothing
-			}
-			if (writer != null) {
-				setData(current, session, writerState, swriter);
-				writer.close();
-			}
-		}
-
-		return currentSession;
-	}
-
-	/**
-	 * Assigns data from writer to appropriate field of current Log Entry or Session,
-	 * depending on writer state.
-	 */
-	private static void setData(LogEntry current, LogSession session, int writerState, StringWriter swriter) {
-		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) {
-			StringBuffer sb = new StringBuffer(current.getMessage());
-			sb.append(swriter.toString());
-			current.setMessage(sb.toString().trim());
-		}
-	}
-
-	/**
-	 * Updates the {@link currentSession} to be the one that is not null or has most recent date.
-	 * @param session
-	 */
-	private static LogSession updateCurrentSession(LogSession currentSession, LogSession session) {
-		if (currentSession == null) {
-			return session;
-		}
-		Date currentDate = currentSession.getDate();
-		Date sessionDate = session.getDate();
-		if (currentDate == null && sessionDate != null)
-			return session;
-		else if (currentDate != null && sessionDate == null)
-			return session;
-		else if (currentDate != null && sessionDate != null && sessionDate.after(currentDate))
-			return session;
-
-		return currentSession;
-	}
-
-	/**
-	 * Adds entry to the list if it's not filtered. Removes entries exceeding the count limit.
-	 * 
-	 * @param entry
-	 * @param entries
-	 * @param memento
-	 */
-	private static void addEntry(LogEntry entry, List entries, IMemento memento) {
-
-		if (isLogged(entry, memento)) {
-			entries.add(entry);
-
-			if (memento.getString(LogView.P_USE_LIMIT).equals("true")) {//$NON-NLS-1$
-				int limit = memento.getInteger(LogView.P_LOG_LIMIT).intValue();
-				if (entries.size() > limit) {
-					entries.remove(0);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns whether given entry is logged (true) or filtered (false).
-	 * 
-	 * @param entry
-	 * @param memento
-	 * @return is entry logged or filtered
-	 */
-	public static boolean isLogged(LogEntry entry, IMemento memento) {
-		int severity = entry.getSeverity();
-		switch (severity) {
-			case IStatus.INFO :
-				return memento.getString(LogView.P_LOG_INFO).equals("true"); //$NON-NLS-1$
-			case IStatus.WARNING :
-				return memento.getString(LogView.P_LOG_WARNING).equals("true"); //$NON-NLS-1$
-			case IStatus.ERROR :
-				return memento.getString(LogView.P_LOG_ERROR).equals("true"); //$NON-NLS-1$
-			case IStatus.OK :
-				return memento.getString(LogView.P_LOG_OK).equals("true"); //$NON-NLS-1$
-		}
-
-		return false;
-	}
-
-	private static void setNewParent(ArrayList parents, LogEntry entry, int depth) {
-		if (depth + 1 > parents.size())
-			parents.add(entry);
-		else
-			parents.set(depth, entry);
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java
deleted file mode 100644
index 46c3835..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 207344
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 218648 
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import com.ibm.icu.text.SimpleDateFormat;
-import java.io.PrintWriter;
-import java.text.ParseException;
-import java.util.Date;
-
-/**
- * Group of entries with additional Session data.
- */
-public class LogSession extends Group {
-
-	/**
-	 * Describes the !SESSION header name
-	 * 
-	 * @since 3.5
-	 */
-	public static final String SESSION = "!SESSION"; //$NON-NLS-1$
-	private String sessionData;
-	private Date date;
-
-	public LogSession() {
-		super(Messages.LogViewLabelProvider_Session);
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(String dateString) {
-		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$
-		try {
-			date = formatter.parse(dateString);
-		} catch (ParseException e) { // do nothing
-		}
-	}
-
-	public String getSessionData() {
-		return sessionData;
-	}
-
-	void setSessionData(String data) {
-		this.sessionData = data;
-	}
-
-	public void processLogLine(String line) {
-		// process "!SESSION <dateUnknownFormat> ----------------------------"
-		if (line.startsWith(SESSION)) {
-			line = line.substring(SESSION.length()).trim(); // strip "!SESSION "
-			int delim = line.indexOf("----"); //$NON-NLS-1$ // single "-" may be in date, so take few for sure
-			if (delim == -1) {
-				return;
-			}
-			String dateBuffer = line.substring(0, delim).trim();
-			setDate(dateBuffer);
-		}
-	}
-
-	public void write(PrintWriter writer) {
-		writer.write(sessionData);
-		writer.println();
-		super.write(writer);
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java
deleted file mode 100644
index 4fa646e..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java
+++ /dev/null

@@ -1,1691 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 202584, 207344
- *     													bugs 207323, 207931, 207101
- *     													bugs 172658, 216341, 216657
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 218648 
- *     Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>  - bug 247907
- *******************************************************************************/
-
-package org.eclipse.ui.internal.views.log;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-import java.util.List;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.util.Policy;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.ui.part.ViewPart;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-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_OK = "ok"; //$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$
-	protected static final String P_COLUMN_1 = "column2"; //$NON-NLS-1$
-	protected static final String P_COLUMN_2 = "column3"; //$NON-NLS-1$
-	protected 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_SHOW_FILTER_TEXT = "show_filter_text"; //$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$
-	public static final String P_IMPORT_LOG = "importLog"; //$NON-NLS-1$
-	public static final String P_GROUP_BY = "groupBy"; //$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;
-
-	public static final int GROUP_BY_NONE = 0;
-	public static final int GROUP_BY_SESSION = 1;
-	public static final int GROUP_BY_PLUGIN = 2;
-
-	private List elements;
-	private Map groups;
-	private LogSession currentSession;
-
-	private List batchedEntries;
-	private boolean batchEntries;
-
-	private Clipboard fClipboard;
-
-	private IMemento fMemento;
-	private File fInputFile;
-	private String fDirectory;
-
-	private Comparator fComparator;
-
-	// hover text
-	private boolean fCanOpenTextShell;
-	private Text fTextLabel;
-	private Shell fTextShell;
-
-	private boolean fFirstEvent = true;
-
-	private TreeColumn fColumn1;
-	private TreeColumn fColumn2;
-	private TreeColumn fColumn3;
-
-	private Tree fTree;
-	private FilteredTree fFilteredTree;
-	private LogViewLabelProvider fLabelProvider;
-
-	private Action fPropertiesAction;
-	private Action fDeleteLogAction;
-	private Action fReadLogAction;
-	private Action fCopyAction;
-	private Action fActivateViewAction;
-	private Action fOpenLogAction;
-	private Action fExportLogAction;
-	private Action fExportLogEntryAction;
-
-	/**
-	 * Action called when user selects "Group by -> ..." from menu.
-	 */
-	class GroupByAction extends Action {
-		private int groupBy;
-
-		public GroupByAction(String text, int groupBy) {
-			super(text, IAction.AS_RADIO_BUTTON);
-
-			this.groupBy = groupBy;
-
-			if (fMemento.getInteger(LogView.P_GROUP_BY).intValue() == groupBy) {
-				setChecked(true);
-			}
-		}
-
-		public void run() {
-			if (fMemento.getInteger(LogView.P_GROUP_BY).intValue() != groupBy) {
-				fMemento.putInteger(LogView.P_GROUP_BY, groupBy);
-				reloadLog();
-			}
-		}
-	}
-
-	/**
-	 * Constructor
-	 */
-	public LogView() {
-		elements = new ArrayList();
-		groups = new HashMap();
-		batchedEntries = new ArrayList();
-		fInputFile = Platform.getLogFileLocation().toFile();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		readLogFile();
-		createViewer(composite);
-		getSite().setSelectionProvider(fFilteredTree.getViewer());
-		createActions();
-		fClipboard = new Clipboard(fTree.getDisplay());
-		fTree.setToolTipText(""); //$NON-NLS-1$
-		initializeViewerSorter();
-
-		makeHoverShell();
-
-		Platform.addLogListener(this);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(fFilteredTree, IHelpContextIds.LOG_VIEW);
-		getSite().getWorkbenchWindow().addPerspectiveListener(new IPerspectiveListener2() {
-
-			public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
-				if (!(partRef instanceof IViewReference))
-					return;
-
-				IWorkbenchPart part = partRef.getPart(false);
-				if (part == null) {
-					return;
-				}
-
-				if (part.equals(LogView.this)) {
-					if (changeId.equals(IWorkbenchPage.CHANGE_VIEW_SHOW)) {
-						if (!batchedEntries.isEmpty()) {
-							pushBatchedEntries();
-						}
-
-						batchEntries = false;
-					} else if (changeId.equals(IWorkbenchPage.CHANGE_VIEW_HIDE)) {
-						batchEntries = true;
-					}
-				}
-			}
-
-			public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-				// empty
-			}
-
-			public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
-				// empty
-			}
-
-		});
-	}
-
-	/**
-	 * Creates the actions for the viewsite action bars
-	 */
-	private void createActions() {
-		IActionBars bars = getViewSite().getActionBars();
-
-		fCopyAction = createCopyAction();
-		bars.setGlobalActionHandler(ActionFactory.COPY.getId(), fCopyAction);
-
-		IToolBarManager toolBarManager = bars.getToolBarManager();
-
-		fExportLogAction = createExportLogAction();
-		toolBarManager.add(fExportLogAction);
-
-		fExportLogEntryAction = createExportLogEntryAction();
-
-		final Action importLogAction = createImportLogAction();
-		toolBarManager.add(importLogAction);
-
-		toolBarManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-
-		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(createGroupByAction());
-		mgr.add(new Separator());
-		mgr.add(createFilterAction());
-		mgr.add(new Separator());
-
-		fActivateViewAction = createActivateViewAction();
-		mgr.add(fActivateViewAction);
-		if (fFilteredTree.getFilterControl() != null)
-			mgr.add(createShowTextFilter());
-
-		fPropertiesAction = 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(fExportLogAction);
-				manager.add(createImportLogAction());
-				manager.add(new Separator());
-				manager.add(fExportLogEntryAction);
-				manager.add(new Separator());
-
-				((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
-				TreeItem[] selection = fTree.getSelection();
-				if ((selection.length > 0) && (selection[0].getData() instanceof LogEntry)) {
-					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(Messages.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(Messages.LogView_clear) {
-			public void run() {
-				handleClear();
-			}
-		};
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_CLEAR));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_CLEAR_DISABLED));
-		action.setToolTipText(Messages.LogView_clear_tooltip);
-		action.setText(Messages.LogView_clear);
-		return action;
-	}
-
-	private Action createCopyAction() {
-		Action action = new Action(Messages.LogView_copy) {
-			public void run() {
-				copyToClipboard(fFilteredTree.getViewer().getSelection());
-			}
-		};
-		action.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		return action;
-	}
-
-	private Action createDeleteLogAction() {
-		Action action = new Action(Messages.LogView_delete) {
-			public void run() {
-				doDeleteLog();
-			}
-		};
-		action.setToolTipText(Messages.LogView_delete_tooltip);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_REMOVE_LOG));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_REMOVE_LOG_DISABLED));
-		action.setEnabled(fInputFile.exists() && fInputFile.equals(Platform.getLogFileLocation().toFile()));
-		return action;
-	}
-
-	private Action createExportLogAction() {
-		Action action = new Action(Messages.LogView_export) {
-			public void run() {
-				handleExport(true);
-			}
-		};
-		action.setToolTipText(Messages.LogView_export_tooltip);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT_DISABLED));
-		action.setEnabled(fInputFile.exists());
-		return action;
-	}
-
-	private Action createExportLogEntryAction() {
-		Action action = new Action(Messages.LogView_exportEntry) {
-			public void run() {
-				handleExport(false);
-			}
-		};
-		action.setToolTipText(Messages.LogView_exportEntry_tooltip);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT_DISABLED));
-		action.setEnabled(!fFilteredTree.getViewer().getSelection().isEmpty());
-		return action;
-	}
-
-	private Action createFilterAction() {
-		Action action = new Action(Messages.LogView_filter) {
-			public void run() {
-				handleFilter();
-			}
-		};
-		action.setToolTipText(Messages.LogView_filter);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_FILTER));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_FILTER_DISABLED));
-		return action;
-	}
-
-	private Action createImportLogAction() {
-		Action action = new ImportLogAction(this, Messages.LogView_import, fMemento);
-		action.setToolTipText(Messages.LogView_import_tooltip);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_IMPORT));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_IMPORT_DISABLED));
-		return action;
-	}
-
-	private Action createOpenLogAction() {
-		Action action = null;
-		try {
-			// TODO this isn't the best way to check... we should be smarter and use package admin
-			// check to see if org.eclipse.ui.ide is available
-			Class.forName("org.eclipse.ui.ide.IDE"); //$NON-NLS-1$
-			// check to see if org.eclipse.core.filesystem is available
-			Class.forName("org.eclipse.core.filesystem.IFileStore"); //$NON-NLS-1$
-			action = new OpenIDELogFileAction(this);
-		} catch (ClassNotFoundException e) {
-			action = new Action() {
-				public void run() {
-					if (fInputFile.exists()) {
-						Job job = getOpenLogFileJob();
-						job.setUser(false);
-						job.setPriority(Job.SHORT);
-						job.schedule();
-					}
-				}
-			};
-		}
-		action.setText(Messages.LogView_view_currentLog);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_OPEN_LOG));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_OPEN_LOG_DISABLED));
-		action.setEnabled(fInputFile.exists());
-		action.setToolTipText(Messages.LogView_view_currentLog_tooltip);
-		return action;
-	}
-
-	private Action createPropertiesAction() {
-		Action action = new EventDetailsDialogAction(fTree, fFilteredTree.getViewer(), fMemento);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_PROPERTIES));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_PROPERTIES_DISABLED));
-		action.setToolTipText(Messages.LogView_properties_tooltip);
-		action.setEnabled(false);
-		return action;
-	}
-
-	private Action createReadLogAction() {
-		Action action = new Action(Messages.LogView_readLog_restore) {
-			public void run() {
-				fInputFile = Platform.getLogFileLocation().toFile();
-				reloadLog();
-			}
-		};
-		action.setToolTipText(Messages.LogView_readLog_restore_tooltip);
-		action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_READ_LOG));
-		action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_READ_LOG_DISABLED));
-		return action;
-	}
-
-	/**
-	 * Creates the Show Text Filter view menu action 
-	 * @return the new action for the Show Text Filter 
-	 */
-	private Action createShowTextFilter() {
-		Action action = new Action(Messages.LogView_show_filter_text) {
-			public void run() {
-				showFilterText(isChecked());
-			}
-		};
-		boolean visible = fMemento.getBoolean(P_SHOW_FILTER_TEXT).booleanValue();
-		action.setChecked(visible);
-		showFilterText(visible);
-		return action;
-	}
-
-	/**
-	 * Shows/hides the filter text control from the filtered tree. This method also sets the 
-	 * P_SHOW_FILTER_TEXT preference to the visible state
-	 * 
-	 * @param visible if the filter text control should be shown or not
-	 */
-	private void showFilterText(boolean visible) {
-		fMemento.putBoolean(P_SHOW_FILTER_TEXT, visible);
-
-		Text filterControl = fFilteredTree.getFilterControl();
-		Composite filterComposite = filterControl.getParent(); // FilteredTree new look lays filter Text on additional composite
-
-		GridData gd = (GridData) filterComposite.getLayoutData();
-		gd.exclude = !visible;
-		filterComposite.setVisible(visible);
-
-		// reset control if we aren't visible and if we get visible again
-		filterControl.setText(Messages.LogView_show_filter_initialText);
-
-		if (visible) {
-			filterControl.selectAll();
-			setFocus();
-		}
-
-		fFilteredTree.layout(false);
-	}
-
-	private IContributionItem createGroupByAction() {
-		IMenuManager manager = new MenuManager(Messages.LogView_GroupBy);
-		manager.add(new GroupByAction(Messages.LogView_GroupBySession, LogView.GROUP_BY_SESSION));
-		manager.add(new GroupByAction(Messages.LogView_GroupByPlugin, LogView.GROUP_BY_PLUGIN));
-		manager.add(new GroupByAction(Messages.LogView_GroupByNone, LogView.GROUP_BY_NONE));
-		return manager;
-	}
-
-	private void createViewer(Composite parent) {
-		PatternFilter filter = new PatternFilter() {
-			protected boolean isLeafMatch(Viewer viewer, Object element) {
-				if (element instanceof LogEntry) {
-					LogEntry logEntry = (LogEntry) element;
-					String message = logEntry.getMessage();
-					String plugin = logEntry.getPluginId();
-					DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-					String date = dateFormat.format(logEntry.getDate());
-					return wordMatches(message) || wordMatches(plugin) || wordMatches(date);
-				}
-				return false;
-			}
-		};
-		filter.setIncludeLeadingWildcard(true);
-		fFilteredTree = new FilteredTree(parent, SWT.FULL_SELECTION, filter, true);
-		// need to give filter Textbox some space from the border
-		if (fFilteredTree.getFilterControl() != null) {
-			Composite filterComposite = fFilteredTree.getFilterControl().getParent(); // FilteredTree new look lays filter Text on additional composite
-			GridData gd = (GridData) filterComposite.getLayoutData();
-			gd.verticalIndent = 2;
-			gd.horizontalIndent = 1;
-		}
-		fFilteredTree.setLayoutData(new GridData(GridData.FILL_BOTH));
-		fFilteredTree.setInitialText(Messages.LogView_show_filter_initialText);
-		fTree = fFilteredTree.getViewer().getTree();
-		fTree.setLinesVisible(true);
-		createColumns(fTree);
-		fFilteredTree.getViewer().setAutoExpandLevel(2);
-		fFilteredTree.getViewer().setContentProvider(new LogViewContentProvider(this));
-		fFilteredTree.getViewer().setLabelProvider(fLabelProvider = new LogViewLabelProvider(this));
-		fLabelProvider.connect(this);
-		fFilteredTree.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				handleSelectionChanged(e.getSelection());
-				if (fPropertiesAction.isEnabled())
-					((EventDetailsDialogAction) fPropertiesAction).resetSelection();
-			}
-		});
-		fFilteredTree.getViewer().addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
-				fPropertiesAction.run();
-			}
-		});
-		fFilteredTree.getViewer().setInput(this);
-		addMouseListeners();
-		addDragSource();
-	}
-
-	private void createColumns(Tree tree) {
-		fColumn1 = new TreeColumn(tree, SWT.LEFT);
-		fColumn1.setText(Messages.LogView_column_message);
-		fColumn1.setWidth(fMemento.getInteger(P_COLUMN_1).intValue());
-		fColumn1.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				MESSAGE_ORDER *= -1;
-				ViewerComparator comparator = getViewerComparator(MESSAGE);
-				fFilteredTree.getViewer().setComparator(comparator);
-				boolean isComparatorSet = ((EventDetailsDialogAction) fPropertiesAction).resetSelection(MESSAGE, MESSAGE_ORDER);
-				setComparator(MESSAGE);
-				if (!isComparatorSet)
-					((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
-				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(Messages.LogView_column_plugin);
-		fColumn2.setWidth(fMemento.getInteger(P_COLUMN_2).intValue());
-		fColumn2.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				PLUGIN_ORDER *= -1;
-				ViewerComparator comparator = getViewerComparator(PLUGIN);
-				fFilteredTree.getViewer().setComparator(comparator);
-				boolean isComparatorSet = ((EventDetailsDialogAction) fPropertiesAction).resetSelection(PLUGIN, PLUGIN_ORDER);
-				setComparator(PLUGIN);
-				if (!isComparatorSet)
-					((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
-				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(Messages.LogView_column_date);
-		fColumn3.setWidth(fMemento.getInteger(P_COLUMN_3).intValue());
-		fColumn3.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				DATE_ORDER *= -1;
-				ViewerComparator comparator = getViewerComparator(DATE);
-				fFilteredTree.getViewer().setComparator(comparator);
-				setComparator(DATE);
-				((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
-				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();
-		ViewerComparator comparator = getViewerComparator(orderType);
-		fFilteredTree.getViewer().setComparator(comparator);
-		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();
-		if (fTextShell != null)
-			fTextShell.dispose();
-		fLabelProvider.disconnect(this);
-		fFilteredTree.dispose();
-		super.dispose();
-	}
-
-	/**
-	 * Import log from file selected in FileDialog.
-	 */
-	void handleImport() {
-		FileDialog dialog = new FileDialog(getViewSite().getShell());
-		dialog.setFilterExtensions(new String[] {"*.log"}); //$NON-NLS-1$
-		if (fDirectory != null)
-			dialog.setFilterPath(fDirectory);
-		String path = dialog.open();
-		if (path == null) { // cancel
-			return;
-		}
-
-		File file = new Path(path).toFile();
-		if (file.exists()) {
-			handleImportPath(path);
-		} else {
-			String msg = NLS.bind(Messages.LogView_FileCouldNotBeFound, file.getName());
-			MessageDialog.openError(getViewSite().getShell(), Messages.LogView_OpenFile, msg);
-		}
-	}
-
-	/**
-	 * Import log from given file path. Do nothing if file not exists.
-	 * @param path path to log file.
-	 */
-	public void handleImportPath(String path) {
-		File file = new File(path);
-		if (path != null && file.exists()) {
-			setLogFile(file);
-		}
-	}
-
-	/**
-	 * Import log from given file path.
-	 * @param path path to log file.
-	 */
-	protected void setLogFile(File path) {
-		fInputFile = path;
-		fDirectory = fInputFile.getParent();
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask(Messages.LogView_operation_importing, IProgressMonitor.UNKNOWN);
-				readLogFile();
-			}
-		};
-		ProgressMonitorDialog pmd = new ProgressMonitorDialog(getViewSite().getShell());
-		try {
-			pmd.run(true, true, op);
-		} catch (InvocationTargetException e) { // do nothing
-		} catch (InterruptedException e) { // do nothing
-		} finally {
-			fReadLogAction.setText(Messages.LogView_readLog_reload);
-			fReadLogAction.setToolTipText(Messages.LogView_readLog_reload);
-			asyncRefresh(false);
-			resetDialogButtons();
-		}
-	}
-
-	private void handleExport(boolean exportWholeLog) {
-		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.indexOf('.') == -1 && !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(Messages.LogView_confirmOverwrite_message, outputFile.toString());
-				if (!MessageDialog.openQuestion(getViewSite().getShell(), (exportWholeLog ? Messages.LogView_exportLog : Messages.LogView_exportLogEntry), message))
-					return;
-			}
-
-			Reader in = null;
-			Writer out = null;
-			try {
-				out = new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"); //$NON-NLS-1$
-				if (exportWholeLog)
-					in = new InputStreamReader(new FileInputStream(fInputFile), "UTF-8"); //$NON-NLS-1$
-				else {
-					String selectedEntryAsString = selectionToString(fFilteredTree.getViewer().getSelection());
-					in = new StringReader(selectedEntryAsString);
-				}
-				copy(in, out);
-			} catch (IOException ex) {
-				// do nothing
-			} finally {
-				try {
-					if (in != null)
-						in.close();
-					if (out != null)
-						out.close();
-				} catch (IOException e1) {
-					// do nothing
-				}
-			}
-		}
-	}
-
-	private void copy(Reader input, Writer output) throws IOException {
-		BufferedReader reader = null;
-		BufferedWriter writer = null;
-		reader = new BufferedReader(input);
-		writer = new BufferedWriter(output);
-		String line;
-		while (reader.ready() && ((line = reader.readLine()) != null)) {
-			writer.write(line);
-			writer.newLine();
-		}
-	}
-
-	private void handleFilter() {
-		FilterDialog dialog = new FilterDialog(getSite().getShell(), fMemento);
-		dialog.create();
-		dialog.getShell().setText(Messages.LogView_FilterDialog_title);
-		if (dialog.open() == Window.OK)
-			reloadLog();
-	}
-
-	private void doDeleteLog() {
-		String title = Messages.LogView_confirmDelete_title;
-		String message = Messages.LogView_confirmDelete_message;
-		if (!MessageDialog.openConfirm(fTree.getShell(), title, message))
-			return;
-		if (fInputFile.delete() || elements.size() > 0) {
-			handleClear();
-		}
-	}
-
-	public void fillContextMenu(IMenuManager manager) { // nothing
-	}
-
-	public AbstractEntry[] getElements() {
-		return (AbstractEntry[]) elements.toArray(new AbstractEntry[elements.size()]);
-	}
-
-	protected void handleClear() {
-		BusyIndicator.showWhile(fTree.getDisplay(), new Runnable() {
-			public void run() {
-				elements.clear();
-				groups.clear();
-				if (currentSession != null) {
-					currentSession.removeAllChildren();
-				}
-				asyncRefresh(false);
-				resetDialogButtons();
-			}
-		});
-	}
-
-	/**
-	 * Reloads the log
-	 */
-	protected void reloadLog() {
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask(Messages.LogView_operation_reloading, IProgressMonitor.UNKNOWN);
-				readLogFile();
-			}
-		};
-		ProgressMonitorDialog pmd = new ProgressMonitorDialog(getViewSite().getShell());
-		try {
-			pmd.run(true, true, op);
-		} catch (InvocationTargetException e) { // do nothing
-		} catch (InterruptedException e) { // do nothing
-		} finally {
-			fReadLogAction.setText(Messages.LogView_readLog_restore);
-			fReadLogAction.setToolTipText(Messages.LogView_readLog_restore);
-			asyncRefresh(false);
-			resetDialogButtons();
-		}
-	}
-
-	/**
-	 * Reads the chosen backing log file
-	 */
-	void readLogFile() {
-		elements.clear();
-		groups.clear();
-
-		List result = new ArrayList();
-		LogSession lastLogSession = LogReader.parseLogFile(fInputFile, result, fMemento);
-		if ((lastLogSession != null) && isEclipseStartTime(lastLogSession.getDate())) {
-			currentSession = lastLogSession;
-		} else {
-			currentSession = null;
-		}
-
-		group(result);
-		limitEntriesCount();
-
-		getSite().getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				setContentDescription(getTitleSummary());
-			}
-		});
-
-	}
-
-	private boolean isEclipseStartTime(Date date) {
-		String ts = System.getProperty("eclipse.startTime"); //$NON-NLS-1$
-		try {
-			return (ts != null && date != null && date.getTime() == Long.parseLong(ts));
-		} catch (NumberFormatException e) {
-			// empty
-		}
-		return false;
-	}
-
-	private String getTitleSummary() {
-		String path = ""; //$NON-NLS-1$
-		try {
-			path = fInputFile.getCanonicalPath();
-		} catch (IOException e) { // log nothing
-		}
-
-		if (isPlatformLogOpen()) {
-			return Messages.LogView_WorkspaceLogFile;
-		}
-
-		Map sources = LogFilesManager.getLogSources();
-		if (sources.containsValue(path)) {
-			for (Iterator i = sources.keySet().iterator(); i.hasNext();) {
-				String key = (String) i.next();
-				if (sources.get(key).equals(path)) {
-					return NLS.bind(Messages.LogView_LogFileTitle, new String[] {key, path});
-				}
-			}
-		}
-
-		return path;
-	}
-
-	/**
-	 * Add new entries to correct groups in the view.
-	 * @param entries new entries to show up in groups in the view.
-	 */
-	private void group(List entries) {
-		if (fMemento.getInteger(P_GROUP_BY).intValue() == GROUP_BY_NONE) {
-			elements.addAll(entries);
-		} else {
-			for (Iterator i = entries.iterator(); i.hasNext();) {
-				LogEntry entry = (LogEntry) i.next();
-				Group group = getGroup(entry);
-				group.addChild(entry);
-			}
-		}
-	}
-
-	/**
-	 * Limits the number of entries according to the max entries limit set in
-	 * memento.
-	 */
-	private void limitEntriesCount() {
-		int limit = Integer.MAX_VALUE;
-		if (fMemento.getString(LogView.P_USE_LIMIT).equals("true")) {//$NON-NLS-1$
-			limit = fMemento.getInteger(LogView.P_LOG_LIMIT).intValue();
-		}
-
-		int entriesCount = getEntriesCount();
-
-		if (entriesCount <= limit) {
-			return;
-		}
-		Comparator dateComparator = new Comparator() {
-			public int compare(Object o1, Object o2) {
-				Date l1 = ((LogEntry) o1).getDate();
-				Date l2 = ((LogEntry) o2).getDate();
-				if ((l1 != null) && (l2 != null)) {
-					return l1.before(l2) ? -1 : 1;
-				} else if ((l1 == null) && (l2 == null)) {
-					return 0;
-				} else
-					return (l1 == null) ? -1 : 1;
-			}
-		};
-
-		if (fMemento.getInteger(P_GROUP_BY).intValue() == GROUP_BY_NONE) {
-			elements.subList(0, elements.size() - limit).clear();
-		} else {
-			List copy = new ArrayList(entriesCount);
-			for (Iterator i = elements.iterator(); i.hasNext();) {
-				AbstractEntry group = (AbstractEntry) i.next();
-				copy.addAll(Arrays.asList(group.getChildren(group)));
-			}
-
-			Collections.sort(copy, dateComparator);
-			List toRemove = copy.subList(0, copy.size() - limit);
-
-			for (Iterator i = elements.iterator(); i.hasNext();) {
-				AbstractEntry group = (AbstractEntry) i.next();
-				group.removeChildren(toRemove);
-			}
-		}
-
-	}
-
-	private int getEntriesCount() {
-		if (fMemento.getInteger(P_GROUP_BY).intValue() == GROUP_BY_NONE) {
-			return elements.size();
-		}
-		int size = 0;
-		for (Iterator i = elements.iterator(); i.hasNext();) {
-			AbstractEntry group = (AbstractEntry) i.next();
-			size += group.size();
-		}
-		return size;
-	}
-
-	/**
-	 * Returns group appropriate for the entry. Group depends on P_GROUP_BY
-	 * preference, or is null if grouping is disabled (GROUP_BY_NONE), or group
-	 * could not be determined. May create group if it haven't existed before.
-	 * 
-	 * @param entry entry to be grouped
-	 * @return group or null if grouping is disabled
-	 */
-	protected Group getGroup(LogEntry entry) {
-		int groupBy = fMemento.getInteger(P_GROUP_BY).intValue();
-		Object elementGroupId = null;
-		String groupName = null;
-
-		switch (groupBy) {
-			case GROUP_BY_PLUGIN :
-				groupName = entry.getPluginId();
-				elementGroupId = groupName;
-				break;
-
-			case GROUP_BY_SESSION :
-				elementGroupId = entry.getSession();
-				break;
-
-			default : // grouping is disabled
-				return null;
-		}
-
-		if (elementGroupId == null) { // could not determine group
-			return null;
-		}
-
-		Group group = (Group) groups.get(elementGroupId);
-		if (group == null) {
-			if (groupBy == GROUP_BY_SESSION) {
-				group = entry.getSession();
-			} else {
-				group = new Group(groupName);
-			}
-			groups.put(elementGroupId, group);
-			elements.add(group);
-		}
-
-		return group;
-	}
-
-	public void logging(IStatus status, String plugin) {
-		if (!isPlatformLogOpen())
-			return;
-
-		if (batchEntries) {
-			// create LogEntry immediately to don't loose IStatus creation date.
-			LogEntry entry = createLogEntry(status);
-			batchedEntries.add(entry);
-			return;
-		}
-
-		if (fFirstEvent || (currentSession == null)) {
-			readLogFile();
-			asyncRefresh(true);
-			fFirstEvent = false;
-		} else {
-			LogEntry entry = createLogEntry(status);
-
-			if (!batchedEntries.isEmpty()) {
-				// batch new entry as well, to have only one asyncRefresh()
-				batchedEntries.add(entry);
-				pushBatchedEntries();
-			} else {
-				pushEntry(entry);
-				asyncRefresh(true);
-			}
-		}
-	}
-
-	/**
-	 * Push batched entries to log view.
-	 */
-	private void pushBatchedEntries() {
-		Job job = new Job(Messages.LogView_AddingBatchedEvents) {
-			protected IStatus run(IProgressMonitor monitor) {
-				for (int i = 0; i < batchedEntries.size(); i++) {
-					if (!monitor.isCanceled()) {
-						LogEntry entry = (LogEntry) batchedEntries.get(i);
-						pushEntry(entry);
-						batchedEntries.remove(i);
-					}
-				}
-				asyncRefresh(true);
-				return Status.OK_STATUS;
-			}
-		};
-		job.schedule();
-	}
-
-	private LogEntry createLogEntry(IStatus status) {
-		LogEntry entry = new LogEntry(status);
-		entry.setSession(currentSession);
-		return entry;
-	}
-
-	private synchronized void pushEntry(LogEntry entry) {
-		if (LogReader.isLogged(entry, fMemento)) {
-			group(Collections.singletonList(entry));
-			limitEntriesCount();
-		}
-		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()) {
-						TreeViewer viewer = fFilteredTree.getViewer();
-						viewer.refresh();
-						viewer.expandToLevel(2);
-						fDeleteLogAction.setEnabled(fInputFile.exists() && fInputFile.equals(Platform.getLogFileLocation().toFile()));
-						fOpenLogAction.setEnabled(fInputFile.exists());
-						fExportLogAction.setEnabled(fInputFile.exists());
-						fExportLogEntryAction.setEnabled(!viewer.getSelection().isEmpty());
-						if (activate && fActivateViewAction.isChecked()) {
-							IWorkbenchPage page = Activator.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
-							if (page != null)
-								page.bringToTop(view);
-						}
-					}
-				}
-			});
-		}
-	}
-
-	public void setFocus() {
-		if (fFilteredTree != null) {
-			if (fMemento.getBoolean(P_SHOW_FILTER_TEXT).booleanValue()) {
-				Text filterControl = fFilteredTree.getFilterControl();
-				if (filterControl != null && !filterControl.isDisposed()) {
-					filterControl.setFocus();
-				}
-			} else if (!fFilteredTree.isDisposed()) {
-				fFilteredTree.setFocus();
-			}
-		}
-	}
-
-	private void handleSelectionChanged(ISelection selection) {
-		updateStatus(selection);
-		fCopyAction.setEnabled((!selection.isEmpty()) && ((IStructuredSelection) selection).getFirstElement() != null);
-		fPropertiesAction.setEnabled(!selection.isEmpty());
-		fExportLogEntryAction.setEnabled(!selection.isEmpty());
-	}
-
-	private void updateStatus(ISelection selection) {
-		IStatusLineManager status = getViewSite().getActionBars().getStatusLineManager();
-		if (selection.isEmpty())
-			status.setMessage(null);
-		else {
-			Object element = ((IStructuredSelection) selection).getFirstElement();
-			status.setMessage(((LogViewLabelProvider) fFilteredTree.getViewer().getLabelProvider()).getColumnText(element, 0));
-		}
-	}
-
-	/**
-	 * Converts selected log view element to string.
-	 * @return textual log entry representation or null if selection doesn't contain log entry
-	 */
-	private static String selectionToString(ISelection selection) {
-		StringWriter writer = new StringWriter();
-		PrintWriter pwriter = new PrintWriter(writer);
-		if (selection.isEmpty())
-			return null;
-		AbstractEntry entry = (AbstractEntry) ((IStructuredSelection) selection).getFirstElement();
-		entry.write(pwriter);
-		pwriter.flush();
-		String textVersion = writer.toString();
-		try {
-			pwriter.close();
-			writer.close();
-		} catch (IOException e) {
-			// empty
-		}
-
-		return textVersion;
-	}
-
-	/**
-	 * Copies selected element to clipboard.
-	 */
-	private void copyToClipboard(ISelection selection) {
-		String textVersion = selectionToString(selection);
-		if ((textVersion != null) && (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;
-		}
-		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_OK) == null) {
-			fMemento.putString(P_LOG_OK, "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$
-		}
-	}
-
-	public void saveState(IMemento memento) {
-		if (this.fMemento == null || memento == null)
-			return;
-		//store some sane values to prevent the view from being broken
-		this.fMemento.putInteger(P_COLUMN_1, getColumnWidth(fColumn1, 300));
-		this.fMemento.putInteger(P_COLUMN_2, getColumnWidth(fColumn2, 150));
-		this.fMemento.putInteger(P_COLUMN_3, getColumnWidth(fColumn3, 150));
-		this.fMemento.putString(P_ACTIVATE, fActivateViewAction.isChecked() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putMemento(this.fMemento);
-		writeSettings();
-	}
-
-	/**
-	 * Returns the width of the column or the default value if the column has been resized to be not visible
-	 * @param column the column to get the width from
-	 * @param defaultwidth the width to return if the column has been resized to not be visible
-	 * @return the width of the column or the default value
-	 * 
-	 * @since 3.6
-	 */
-	int getColumnWidth(TreeColumn column, int defaultwidth) {
-		int width = column.getWidth();
-		return width < 1 ? defaultwidth : width;
-	}
-
-	private void addMouseListeners() {
-		Listener tableListener = new Listener() {
-			public void handleEvent(Event e) {
-				switch (e.type) {
-					case SWT.MouseExit :
-					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, SWT.MouseExit};
-		for (int i = 0; i < tableEvents.length; i++) {
-			fTree.addListener(tableEvents[i], tableListener);
-		}
-	}
-
-	/**
-	 * Adds drag source support to error log tree.
-	 */
-	private void addDragSource() {
-		DragSource source = new DragSource(fTree, DND.DROP_COPY);
-		Transfer[] types = new Transfer[] {TextTransfer.getInstance()};
-		source.setTransfer(types);
-
-		source.addDragListener(new DragSourceAdapter() {
-
-			public void dragStart(DragSourceEvent event) {
-				ISelection selection = fFilteredTree.getViewer().getSelection();
-				if (selection.isEmpty()) {
-					event.doit = false;
-					return;
-				}
-
-				AbstractEntry entry = (AbstractEntry) ((TreeSelection) selection).getFirstElement();
-				if (!(entry instanceof LogEntry)) {
-					event.doit = false;
-					return;
-				}
-			}
-
-			public void dragSetData(DragSourceEvent event) {
-				if (!TextTransfer.getInstance().isSupportedType(event.dataType)) {
-					return;
-				}
-
-				ISelection selection = fFilteredTree.getViewer().getSelection();
-				String textVersion = selectionToString(selection);
-				event.data = textVersion;
-			}
-		});
-	}
-
-	private void makeHoverShell() {
-		// parent it off the workbench window's shell so it will be valid regardless of whether the view is a detached window or not
-		fTextShell = new Shell(getSite().getWorkbenchWindow().getShell(), SWT.NO_FOCUS | SWT.ON_TOP | SWT.TOOL);
-		Display display = fTextShell.getDisplay();
-		fTextShell.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;
-		fTextShell.setLayout(layout);
-		fTextShell.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Composite shellComposite = new Composite(fTextShell, 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));
-		fTextLabel = new Text(shellComposite, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 100;
-		gd.grabExcessHorizontalSpace = true;
-		fTextLabel.setLayoutData(gd);
-		Color c = fTree.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);
-		fTextLabel.setBackground(c);
-		c = fTree.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND);
-		fTextLabel.setForeground(c);
-		fTextLabel.setEditable(false);
-		fTextShell.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				onTextShellDispose(e);
-			}
-		});
-	}
-
-	void onTextShellDispose(DisposeEvent e) {
-		fCanOpenTextShell = true;
-		setFocus();
-	}
-
-	void onMouseDown(Event e) {
-		if (fTextShell != null && !fTextShell.isDisposed() && !fTextShell.isFocusControl()) {
-			fTextShell.setVisible(false);
-			fCanOpenTextShell = true;
-		}
-	}
-
-	void onMouseHover(Event e) {
-		if (!fCanOpenTextShell || fTextShell == null || fTextShell.isDisposed())
-			return;
-		fCanOpenTextShell = false;
-		Point point = new Point(e.x, e.y);
-		TreeItem item = fTree.getItem(point);
-		if (item == null)
-			return;
-
-		String message = null;
-		if (item.getData() instanceof LogEntry) {
-			message = ((LogEntry) item.getData()).getStack();
-		} else if (item.getData() instanceof LogSession) {
-			LogSession session = ((LogSession) item.getData());
-			message = Messages.LogView_SessionStarted;
-			if (session.getDate() != null) {
-				DateFormat formatter = new SimpleDateFormat(LogEntry.F_DATE_FORMAT);
-				message += formatter.format(session.getDate());
-			}
-		}
-
-		if (message == null)
-			return;
-
-		fTextLabel.setText(message);
-		Rectangle bounds = fTree.getDisplay().getBounds();
-		Point cursorPoint = fTree.getDisplay().getCursorLocation();
-		int x = point.x;
-		int y = point.y + 25;
-		int width = fTree.getColumn(0).getWidth();
-		int height = 125;
-		if (cursorPoint.x + width > bounds.width)
-			x -= width;
-		if (cursorPoint.y + height + 25 > bounds.height)
-			y -= height + 27;
-
-		fTextShell.setLocation(fTree.toDisplay(x, y));
-		fTextShell.setSize(width, height);
-		fTextShell.setVisible(true);
-	}
-
-	void onMouseMove(Event e) {
-		if (fTextShell != null && !fTextShell.isDisposed() && fTextShell.isVisible())
-			fTextShell.setVisible(false);
-
-		Point point = new Point(e.x, e.y);
-		TreeItem item = fTree.getItem(point);
-		if (item == null)
-			return;
-		Image image = item.getImage();
-		Object data = item.getData();
-		if (data instanceof LogEntry) {
-			LogEntry entry = (LogEntry) data;
-			int parentCount = getNumberOfParents(entry);
-			int startRange = 20 + Math.max(image.getBounds().width + 2, 7 + 2) * parentCount;
-			int endRange = startRange + 16;
-			fCanOpenTextShell = e.x >= startRange && e.x <= endRange;
-		}
-	}
-
-	private int getNumberOfParents(AbstractEntry entry) {
-		AbstractEntry parent = (AbstractEntry) entry.getParent(entry);
-		if (parent == null)
-			return 0;
-		return 1 + getNumberOfParents(parent);
-	}
-
-	public Comparator getComparator() {
-		return fComparator;
-	}
-
-	private void setComparator(byte sortType) {
-		if (sortType == DATE) {
-			fComparator = new Comparator() {
-				public int compare(Object e1, Object e2) {
-					long date1 = 0;
-					long date2 = 0;
-					if ((e1 instanceof LogEntry) && (e2 instanceof LogEntry)) {
-						date1 = ((LogEntry) e1).getDate().getTime();
-						date2 = ((LogEntry) e2).getDate().getTime();
-					} else if ((e1 instanceof LogSession) && (e2 instanceof LogSession)) {
-						date1 = ((LogSession) e1).getDate() == null ? 0 : ((LogSession) e1).getDate().getTime();
-						date2 = ((LogSession) e2).getDate() == null ? 0 : ((LogSession) e2).getDate().getTime();
-					}
-					if (date1 == date2) {
-						int result = elements.indexOf(e2) - elements.indexOf(e1);
-						if (DATE_ORDER == DESCENDING)
-							result *= DESCENDING;
-						return result;
-					}
-					if (DATE_ORDER == DESCENDING)
-						return date1 > date2 ? DESCENDING : ASCENDING;
-					return date1 < date2 ? DESCENDING : ASCENDING;
-				}
-			};
-		} else if (sortType == PLUGIN) {
-			fComparator = new Comparator() {
-				public int compare(Object e1, Object e2) {
-					if ((e1 instanceof LogEntry) && (e2 instanceof LogEntry)) {
-						LogEntry entry1 = (LogEntry) e1;
-						LogEntry entry2 = (LogEntry) e2;
-						return getDefaultComparator().compare(entry1.getPluginId(), entry2.getPluginId()) * PLUGIN_ORDER;
-					}
-					return 0;
-				}
-			};
-		} else {
-			fComparator = new Comparator() {
-				public int compare(Object e1, Object e2) {
-					if ((e1 instanceof LogEntry) && (e2 instanceof LogEntry)) {
-						LogEntry entry1 = (LogEntry) e1;
-						LogEntry entry2 = (LogEntry) e2;
-						return getDefaultComparator().compare(entry1.getMessage(), entry2.getMessage()) * MESSAGE_ORDER;
-					}
-					return 0;
-				}
-			};
-		}
-	}
-
-	private Comparator getDefaultComparator() {
-		return Policy.getComparator();
-	}
-
-	private ViewerComparator getViewerComparator(byte sortType) {
-		if (sortType == PLUGIN) {
-			return new ViewerComparator() {
-				public int compare(Viewer viewer, Object e1, Object e2) {
-					if ((e1 instanceof LogEntry) && (e2 instanceof LogEntry)) {
-						LogEntry entry1 = (LogEntry) e1;
-						LogEntry entry2 = (LogEntry) e2;
-						return getComparator().compare(entry1.getPluginId(), entry2.getPluginId()) * PLUGIN_ORDER;
-					}
-					return 0;
-				}
-			};
-		} else if (sortType == MESSAGE) {
-			return new ViewerComparator() {
-				public int compare(Viewer viewer, Object e1, Object e2) {
-					if ((e1 instanceof LogEntry) && (e2 instanceof LogEntry)) {
-						LogEntry entry1 = (LogEntry) e1;
-						LogEntry entry2 = (LogEntry) e2;
-						return getComparator().compare(entry1.getMessage(), entry2.getMessage()) * MESSAGE_ORDER;
-					}
-					return 0;
-				}
-			};
-		} else {
-			return new ViewerComparator() {
-				private int indexOf(Object[] array, Object o) {
-					if (o == null)
-						return -1;
-					for (int i = 0; i < array.length; ++i)
-						if (o.equals(array[i]))
-							return i;
-					return -1;
-				}
-
-				public int compare(Viewer viewer, Object e1, Object e2) {
-					long date1 = 0;
-					long date2 = 0;
-					if ((e1 instanceof LogEntry) && (e2 instanceof LogEntry)) {
-						date1 = ((LogEntry) e1).getDate().getTime();
-						date2 = ((LogEntry) e2).getDate().getTime();
-					} else if ((e1 instanceof LogSession) && (e2 instanceof LogSession)) {
-						date1 = ((LogSession) e1).getDate() == null ? 0 : ((LogSession) e1).getDate().getTime();
-						date2 = ((LogSession) e2).getDate() == null ? 0 : ((LogSession) e2).getDate().getTime();
-					}
-
-					if (date1 == date2) {
-						// Everything that appears in LogView should be an AbstractEntry.
-						AbstractEntry parent = (AbstractEntry) ((AbstractEntry) e1).getParent(null);
-						Object[] children = null;
-						if (parent != null)
-							children = parent.getChildren(parent);
-
-						int result = 0;
-						if (children != null) {
-							// The elements in children seem to be in reverse order,
-							// i.e. latest log message first, therefore index(e2)-index(e1)
-							result = indexOf(children, e2) - indexOf(children, e1);
-						} else {
-							result = elements.indexOf(e1) - elements.indexOf(e2);
-						}
-						if (DATE_ORDER == DESCENDING)
-							result *= DESCENDING;
-						return result;
-					}
-					if (DATE_ORDER == DESCENDING)
-						return date1 > date2 ? DESCENDING : ASCENDING;
-					return date1 < date2 ? DESCENDING : ASCENDING;
-				}
-			};
-		}
-	}
-
-	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 = Activator.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 (new InstanceScope()).getNode(Activator.PLUGIN_ID);
-	}
-
-	/**
-	 * Loads any saved {@link IDialogSettings} into the backing view memento
-	 */
-	private void readSettings() {
-		IDialogSettings s = getLogSettings();
-		if (s == null) {
-			initializeMemento();
-		} else {
-			fMemento.putString(P_USE_LIMIT, s.getBoolean(P_USE_LIMIT) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-			fMemento.putString(P_LOG_INFO, s.getBoolean(P_LOG_INFO) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-			fMemento.putString(P_LOG_OK, s.getBoolean(P_LOG_OK) ? "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$
-			try {
-				fMemento.putInteger(P_LOG_LIMIT, s.getInt(P_LOG_LIMIT));
-			} catch (NumberFormatException e) {
-				fMemento.putInteger(P_LOG_LIMIT, 50);
-			}
-		}
-
-		Preferences p = getLogPreferences(); // never returns null
-		fMemento.putInteger(P_COLUMN_1, getColumnWidthPreference(p, P_COLUMN_1, 300));
-		fMemento.putInteger(P_COLUMN_2, getColumnWidthPreference(p, P_COLUMN_2, 150));
-		fMemento.putInteger(P_COLUMN_3, getColumnWidthPreference(p, P_COLUMN_3, 150));
-		fMemento.putBoolean(P_ACTIVATE, p.getBoolean(P_ACTIVATE, true));
-		fMemento.putInteger(P_ORDER_VALUE, p.getInt(P_ORDER_VALUE, DESCENDING));
-		fMemento.putInteger(P_ORDER_TYPE, p.getInt(P_ORDER_TYPE, LogView.DATE));
-		fMemento.putBoolean(P_SHOW_FILTER_TEXT, p.getBoolean(P_SHOW_FILTER_TEXT, true));
-		fMemento.putInteger(P_GROUP_BY, p.getInt(P_GROUP_BY, LogView.GROUP_BY_NONE));
-	}
-
-	/**
-	 * Returns the width to use for the column represented by the given key. The default width
-	 * is returned iff:
-	 * <ul>
-	 * <li>There is no preference for the given key</li>
-	 * <li>The returned preference value is too small, making the columns invisible by width.</li>
-	 * </ul>
-	 * @param preferences
-	 * @param key
-	 * @param defaultwidth
-	 * @return the stored width for the a column described by the given key or the default width
-	 * 
-	 * @since 3.6
-	 */
-	int getColumnWidthPreference(Preferences preferences, String key, int defaultwidth) {
-		int width = preferences.getInt(key, defaultwidth);
-		return width < 1 ? defaultwidth : width;
-	}
-
-	private void writeSettings() {
-		writeViewSettings();
-		writeFilterSettings();
-	}
-
-	private void writeFilterSettings() {
-		IDialogSettings settings = getLogSettings();
-		if (settings == null)
-			settings = Activator.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_OK, fMemento.getString(P_LOG_OK).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.putInt(P_COLUMN_1, fMemento.getInteger(P_COLUMN_1).intValue());
-		preferences.putInt(P_COLUMN_2, fMemento.getInteger(P_COLUMN_2).intValue());
-		preferences.putInt(P_COLUMN_3, fMemento.getInteger(P_COLUMN_3).intValue());
-		preferences.putBoolean(P_ACTIVATE, fMemento.getBoolean(P_ACTIVATE).booleanValue());
-		preferences.putInt(P_ORDER_VALUE, fMemento.getInteger(P_ORDER_VALUE).intValue());
-		preferences.putInt(P_ORDER_TYPE, fMemento.getInteger(P_ORDER_TYPE).intValue());
-		preferences.putBoolean(P_SHOW_FILTER_TEXT, fMemento.getBoolean(P_SHOW_FILTER_TEXT).booleanValue());
-		preferences.putInt(P_GROUP_BY, fMemento.getInteger(P_GROUP_BY).intValue());
-		try {
-			preferences.flush();
-		} catch (BackingStoreException e) {
-			// empty
-		}
-	}
-
-	public void sortByDateDescending() {
-		setColumnSorting(fColumn3, DESCENDING);
-	}
-
-	protected Job getOpenLogFileJob() {
-		final Shell shell = getViewSite().getShell();
-		return new Job(Messages.OpenLogDialog_message) {
-			protected IStatus run(IProgressMonitor monitor) {
-				boolean failed = false;
-				if (fInputFile.length() <= LogReader.MAX_FILE_LENGTH) {
-					failed = !Program.launch(fInputFile.getAbsolutePath());
-					if (failed) {
-						Program p = Program.findProgram(".txt"); //$NON-NLS-1$
-						if (p != null) {
-							p.execute(fInputFile.getAbsolutePath());
-							return Status.OK_STATUS;
-						}
-					}
-				}
-				if (failed) {
-					final OpenLogDialog openDialog = new OpenLogDialog(shell, fInputFile);
-					Display.getDefault().asyncExec(new Runnable() {
-						public void run() {
-							openDialog.create();
-							openDialog.open();
-						}
-					});
-				}
-				return Status.OK_STATUS;
-			}
-		};
-	}
-
-	protected File getLogFile() {
-		return fInputFile;
-	}
-
-	/**
-	 * Returns whether given session equals to currently displayed in LogView.
-	 * @param session LogSession
-	 * @return true if given session equals to currently displayed in LogView
-	 */
-	public boolean isCurrentLogSession(LogSession session) {
-		return isPlatformLogOpen() && (currentSession != null) && (currentSession.equals(session));
-	}
-
-	/**
-	 * Returns whether currently open log is platform log or imported file.
-	 * @return true if currently open log is platform log, false otherwise
-	 */
-	public boolean isPlatformLogOpen() {
-		return (fInputFile.equals(Platform.getLogFileLocation().toFile()));
-	}
-
-	/**
-	 * 
-	 */
-	public void setPlatformLog() {
-		setLogFile(Platform.getLogFileLocation().toFile());
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewContentProvider.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewContentProvider.java
deleted file mode 100644
index ebaea00..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewContentProvider.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583,207344
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-public class LogViewContentProvider implements ITreeContentProvider {
-	private LogView logView;
-
-	public LogViewContentProvider(LogView logView) {
-		this.logView = logView;
-	}
-
-	public void dispose() { // do nothing
-	}
-
-	public Object[] getChildren(Object element) {
-		return ((AbstractEntry) element).getChildren(element);
-	}
-
-	public Object[] getElements(Object element) {
-		return logView.getElements();
-	}
-
-	public Object getParent(Object element) {
-		if (element instanceof LogSession) {
-			return null;
-		}
-		return ((AbstractEntry) element).getParent(element);
-	}
-
-	public boolean hasChildren(Object element) {
-		return ((AbstractEntry) element).getChildren(element).length > 0;
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // do nothing
-	}
-
-	public boolean isDeleted(Object element) {
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java
deleted file mode 100644
index c2dfadd..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogViewLabelProvider.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     EclipseSource Corporation - ongoing enhancements
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 207344, 207101
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import com.ibm.icu.text.DateFormat;
-import java.util.ArrayList;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-public class LogViewLabelProvider extends LabelProvider implements ITableLabelProvider, ITableFontProvider {
-
-	private static int MAX_LABEL_LENGTH = 200;
-
-	private Image infoImage;
-	private Image okImage;
-	private Image errorImage;
-	private Image warningImage;
-	private Image errorWithStackImage;
-	private Image hierarchicalImage;
-	ArrayList consumers = new ArrayList();
-	private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-
-	private LogView logView;
-
-	public LogViewLabelProvider(LogView logView) {
-		errorImage = SharedImages.getImage(SharedImages.DESC_ERROR_ST_OBJ);
-		warningImage = SharedImages.getImage(SharedImages.DESC_WARNING_ST_OBJ);
-		infoImage = SharedImages.getImage(SharedImages.DESC_INFO_ST_OBJ);
-		okImage = SharedImages.getImage(SharedImages.DESC_OK_ST_OBJ);
-		errorWithStackImage = SharedImages.getImage(SharedImages.DESC_ERROR_STACK_OBJ);
-		hierarchicalImage = SharedImages.getImage(SharedImages.DESC_HIERARCHICAL_LAYOUT_OBJ);
-
-		this.logView = logView;
-	}
-
-	public void dispose() {
-		if (consumers.size() == 0) {
-			super.dispose();
-		}
-	}
-
-	public Image getColumnImage(Object element, int columnIndex) {
-		if (element instanceof Group) {
-			return (columnIndex == 0) ? hierarchicalImage : null;
-		}
-
-		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) {
-		if ((element instanceof LogSession) && (columnIndex == 2)) {
-			LogSession session = (LogSession) element;
-			if (session.getDate() == null)
-				return ""; //$NON-NLS-1$
-
-			return dateFormat.format(session.getDate());
-		}
-
-		if ((element instanceof Group) && (columnIndex == 0)) {
-			return element.toString();
-		}
-
-		if (element instanceof LogEntry) {
-			LogEntry entry = (LogEntry) element;
-			switch (columnIndex) {
-				case 0 :
-					if (entry.getMessage() != null) {
-						String message = entry.getMessage();
-						if (message.length() > MAX_LABEL_LENGTH) {
-							String warning = Messages.LogViewLabelProvider_truncatedMessage;
-							StringBuffer sb = new StringBuffer(message.substring(0, MAX_LABEL_LENGTH - warning.length()));
-							sb.append(warning);
-							return sb.toString();
-						}
-						return entry.getMessage();
-					}
-				case 1 :
-					if (entry.getPluginId() != null)
-						return entry.getPluginId();
-				case 2 :
-					return dateFormat.format(entry.getDate());
-			}
-		}
-
-		return ""; //$NON-NLS-1$
-	}
-
-	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 Font getFont(Object element, int columnIndex) {
-		if ((element instanceof LogSession) && (logView.isCurrentLogSession((LogSession) element))) {
-			return JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
-		}
-
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Messages.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Messages.java
deleted file mode 100644
index d5dff7c..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Messages.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bugs 202583, 207344
- *     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 218648 
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	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_exportEntry;
-	public static String LogView_exportLogEntry;
-	public static String LogView_exportEntry_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_show_filter_text;
-	public static String LogView_show_filter_initialText;
-
-	public static String LogView_SessionStarted;
-	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_AddingBatchedEvents;
-	public static String LogView_view_currentLog;
-	public static String LogView_view_currentLog_tooltip;
-	public static String LogView_properties_tooltip;
-
-	public static String LogView_FileCouldNotBeFound;
-	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_ok;
-	public static String LogView_FilterDialog_recentSession;
-	public static String LogView_GroupBy;
-	public static String LogView_GroupByNone;
-	public static String LogView_GroupByPlugin;
-	public static String LogView_GroupBySession;
-	public static String LogView_LogFileTitle;
-	public static String LogView_OpenFile;
-	public static String LogView_WorkspaceLogFile;
-
-	public static String LogViewLabelProvider_Session;
-	public static String LogViewLabelProvider_truncatedMessage;
-
-	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 EventDetailsDialog_FilterDialog;
-	public static String EventDetailsDialog_ShowFilterDialog;
-
-	public static String FilterDialog_Add;
-	public static String FilterDialog_AddFilterTitle;
-	public static String FilterDialog_AddFliterLabel;
-	public static String FilterDialog_EnableFiltersCheckbox;
-	public static String FilterDialog_FilterShouldntContainSemicolon;
-	public static String FilterDialog_Remove;
-
-	public static String OpenLogDialog_title;
-	public static String OpenLogDialog_message;
-	public static String OpenLogDialog_cannotDisplay;
-
-	public static String ImportLogAction_noLaunchHistory;
-	public static String ImportLogAction_reloadWorkspaceLog;
-
-	private static final String BUNDLE_NAME = "org.eclipse.ui.internal.views.log.messages"; //$NON-NLS-1$
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenIDELogFileAction.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenIDELogFileAction.java
deleted file mode 100644
index 069018b..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenIDELogFileAction.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.*;
-import org.eclipse.ui.ide.IDE;
-
-/*
- * This action is used to Open the Log File from the LogView if both org.eclipse.ui.ide and 
- * org.eclipse.core.filesystem are available.  If both plugins are resolved, we will open
- * the log file through the IDE's file association preferences.  Otherwise, 
- * LogView.getOpenLogJob() is called to open the file.
- */
-public class OpenIDELogFileAction extends Action {
-
-	private LogView fView;
-
-	public OpenIDELogFileAction(LogView logView) {
-		fView = logView;
-	}
-
-	public void run() {
-		IPath logPath = new Path(fView.getLogFile().getAbsolutePath());
-		IFileStore fileStore = EFS.getLocalFileSystem().getStore(logPath);
-		if (!fileStore.fetchInfo().isDirectory() && fileStore.fetchInfo().exists()) {
-			IWorkbenchWindow ww = Activator.getDefault().getWorkbench().getActiveWorkbenchWindow();
-			IWorkbenchPage page = ww.getActivePage();
-			try {
-				IDE.openEditorOnFileStore(page, fileStore);
-			} catch (PartInitException e) { // do nothing
-			}
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenLogDialog.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenLogDialog.java
deleted file mode 100644
index 45fef60..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/OpenLogDialog.java
+++ /dev/null

@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ui.internal.views.log;
-
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-
-/**
- * Displays the error log in non-Win32 platforms - see bug 55314.
- */
-public final class OpenLogDialog extends TrayDialog {
-	// 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(Messages.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 = Activator.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
-	void readFile(PrintWriter writer) throws FileNotFoundException, IOException {
-		BufferedReader bReader = new BufferedReader(new FileReader(logFile));
-		while (bReader.ready())
-			writer.println(bReader.readLine());
-	}
-
-	// reading large files
-	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(LogSession.SESSION))) //$NON-NLS-1$
-					hasStarted = true;
-				if (hasStarted)
-					writer.println(line);
-				continue;
-			}
-		} finally {
-			try {
-				if (random != null)
-					random.close();
-			} catch (IOException e1) { // do nothing
-			}
-		}
-	}
-
-	private void readLargeFileWithMonitor(final PrintWriter writer) {
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask(Messages.OpenLogDialog_message, IProgressMonitor.UNKNOWN);
-				try {
-					readLargeFile(writer);
-				} catch (IOException e) {
-					writer.println(Messages.OpenLogDialog_cannotDisplay);
-				}
-			}
-		};
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell());
-		try {
-			dialog.run(true, true, runnable);
-		} catch (InvocationTargetException e) { // do nothing
-		} catch (InterruptedException e) { // do nothing
-		}
-	}
-
-	private void readFileWithMonitor(final PrintWriter writer) {
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask(Messages.OpenLogDialog_message, IProgressMonitor.UNKNOWN);
-				try {
-					readFile(writer);
-				} catch (IOException e) {
-					writer.println(Messages.OpenLogDialog_cannotDisplay);
-				}
-			}
-		};
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell());
-		try {
-			dialog.run(true, true, runnable);
-		} catch (InvocationTargetException e) { // do nothing
-		} catch (InterruptedException e) { // do nothing
-		}
-	}
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/SharedImages.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/SharedImages.java
deleted file mode 100644
index d417d5f..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/SharedImages.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 202583
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-
-public final class SharedImages {
-
-	private SharedImages() { // do nothing
-	}
-
-	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_EVENTS = ICONS_PATH + "eview16/"; //$NON-NLS-1$
-
-	/* Event Details */
-	public static final String DESC_PREV_EVENT = PATH_EVENTS + "event_prev.gif"; //$NON-NLS-1$
-	public static final String DESC_NEXT_EVENT = PATH_EVENTS + "event_next.gif"; //$NON-NLS-1$	
-
-	public static final String DESC_CLEAR = PATH_LCL + "clear.gif"; //$NON-NLS-1$
-	public static final String DESC_CLEAR_DISABLED = PATH_LCL_DISABLED + "clear.gif"; //$NON-NLS-1$
-	public static final String DESC_REMOVE_LOG = PATH_LCL + "remove.gif"; //$NON-NLS-1$
-	public static final String DESC_REMOVE_LOG_DISABLED = PATH_LCL_DISABLED + "remove.gif"; //$NON-NLS-1$
-	public static final String DESC_EXPORT = PATH_LCL + "export_log.gif"; //$NON-NLS-1$
-	public static final String DESC_EXPORT_DISABLED = PATH_LCL_DISABLED + "export_log.gif"; //$NON-NLS-1$
-	public static final String DESC_FILTER = PATH_LCL + "filter_ps.gif"; //$NON-NLS-1$
-	public static final String DESC_FILTER_DISABLED = PATH_LCL_DISABLED + "filter_ps.gif"; //$NON-NLS-1$
-	public static final String DESC_IMPORT = PATH_LCL + "import_log.gif"; //$NON-NLS-1$
-	public static final String DESC_IMPORT_DISABLED = PATH_LCL_DISABLED + "import_log.gif"; //$NON-NLS-1$
-	public static final String DESC_OPEN_LOG = PATH_LCL + "open_log.gif"; //$NON-NLS-1$
-	public static final String DESC_OPEN_LOG_DISABLED = PATH_LCL_DISABLED + "open_log.gif"; //$NON-NLS-1$
-	public static final String DESC_PROPERTIES = PATH_LCL + "properties.gif"; //$NON-NLS-1$
-	public static final String DESC_PROPERTIES_DISABLED = PATH_LCL_DISABLED + "properties.gif"; //$NON-NLS-1$
-	public static final String DESC_READ_LOG = PATH_LCL + "restore_log.gif"; //$NON-NLS-1$
-	public static final String DESC_READ_LOG_DISABLED = PATH_LCL_DISABLED + "restore_log.gif"; //$NON-NLS-1$
-
-	public static final String DESC_ERROR_ST_OBJ = PATH_OBJ + "error_st_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_ERROR_STACK_OBJ = PATH_OBJ + "error_stack.gif"; //$NON-NLS-1$
-	public static final String DESC_INFO_ST_OBJ = PATH_OBJ + "info_st_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_OK_ST_OBJ = PATH_OBJ + "ok_st_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_WARNING_ST_OBJ = PATH_OBJ + "warning_st_obj.gif"; //$NON-NLS-1$
-	public static final String DESC_HIERARCHICAL_LAYOUT_OBJ = PATH_OBJ + "hierarchical.gif"; //$NON-NLS-1$
-
-	public static ImageDescriptor getImageDescriptor(String key) {
-		return Activator.getDefault().getImageRegistry().getDescriptor(key);
-	}
-
-	public static Image getImage(String key) {
-		return Activator.getDefault().getImageRegistry().get(key);
-	}
-
-}

diff --git a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/TailInputStream.java b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/TailInputStream.java
deleted file mode 100644
index 3958c7a..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/TailInputStream.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2007 IBM Corporation and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- *  Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.internal.views.log;
-
-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.ui.views.log/src/org/eclipse/ui/internal/views/log/messages.properties b/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/messages.properties
deleted file mode 100644
index 0814d2a..0000000
--- a/ui/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/messages.properties
+++ /dev/null

@@ -1,95 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 202583, 217201
-#     Benjamin Cabe <benjamin.cabe@anyware-tech.com> - bug 218648 
-###############################################################################
-
-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_exportEntry = &Export Entry...
-LogView_exportEntry_tooltip = Export Entry
-LogView_exportLogEntry=Export Log Entry
-LogView_import = &Import Log...
-LogView_import_tooltip = Import Log
-LogView_filter = &Filters...
-LogView_readLog_reload = &Reload Workspace Log
-LogView_readLog_restore = &Restore Log
-LogView_readLog_restore_tooltip = Restore Log
-LogView_severity_error = Error
-LogView_SessionStarted=Session started 
-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_AddingBatchedEvents=Adding batched log events...
-LogView_view_currentLog = &Open Log
-LogView_view_currentLog_tooltip = Open Log
-LogView_properties_tooltip = Event Details
-LogView_show_filter_text=&Show text filter
-LogView_show_filter_initialText = type filter text
-
-LogView_FileCouldNotBeFound=The file "{0}" could not be found.
-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_ok=&OK
-LogView_FilterDialog_recentSession = &Most recent session
-LogView_GroupBy=Group By
-LogView_GroupByNone=None
-LogView_GroupByPlugin=Plug-in
-LogView_GroupBySession=Session
-LogView_LogFileTitle={0} [{1}]
-LogView_OpenFile=Open File
-LogView_WorkspaceLogFile=Workspace Log
-LogViewLabelProvider_truncatedMessage=... (Open log entry details for full message)
-LogViewLabelProvider_Session=Session
-
-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
-EventDetailsDialog_FilterDialog=Filters
-EventDetailsDialog_ShowFilterDialog=Show Filter Dialog
-FilterDialog_Add=A&dd...
-FilterDialog_AddFilterTitle=Add filter
-FilterDialog_AddFliterLabel=Add stack trace filter:
-FilterDialog_EnableFiltersCheckbox=E&nable filters to hide stack trace elements
-FilterDialog_FilterShouldntContainSemicolon=A semicolon isn't a legal character within a filter
-FilterDialog_Remove=&Remove
-OpenLogDialog_title=Error Log
-OpenLogDialog_message=Opening log...
-OpenLogDialog_cannotDisplay=Log file cannot be displayed.
-ImportLogAction_reloadWorkspaceLog = &Workspace Log
-ImportLogAction_noLaunchHistory=(no logs available)
\ No newline at end of file
commit	5e087ce74647bf28ce4d0fe96c88b598e7163530	[log] [tgz]
author	cvs2svn <platform-releng-dev@eclipse.org>	Mon Jan 24 18:04:17 2011 +0000
committer	cvs2svn <platform-releng-dev@eclipse.org>	Mon Jan 24 18:04:17 2011 +0000
tree	87697b16bdcaea99ce4a605dccb38defd1580fc8
parent	912b5bf9328e4d6272dea1798ad225e1a8520767 [diff]