This commit was manufactured by cvs2svn to create branch 'ZZNick20011129'.

Sprout from master 2001-11-27 17:02:36 UTC Nick Edgar <nick> '*** empty log message ***'
Cherrypick from master 2001-11-29 16:04:46 UTC davids <davids> 'added expressions doc':
    bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java
    bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/DecoratorActionFactory.java
    bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ObjectFilterTest.java
    bundles/org.eclipse.ui/doc/expressions.html
    bundles/org.eclipse.ui/doc/org_eclipse_ui_decorators.html
    bundles/org.eclipse.ui/doc/tag_a.jpg
    bundles/org.eclipse.ui/doc/tag_b.jpg
    bundles/org.eclipse.ui/doc/tag_c.jpg
    bundles/org.eclipse.ui/doc/tag_d.jpg
    bundles/org.eclipse.ui/doc/tag_e.jpg
Delete:
    examples/org.eclipse.ui.examples.multipageeditor/.classpath
    examples/org.eclipse.ui.examples.multipageeditor/.cvsignore
    examples/org.eclipse.ui.examples.multipageeditor/.vcm_meta
    examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MessageUtil.java
    examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageContributor.java
    examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageEditorExample.java
    examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/messages.properties
    examples/org.eclipse.ui.examples.multipageeditor/about.html
    examples/org.eclipse.ui.examples.multipageeditor/build.properties
    examples/org.eclipse.ui.examples.multipageeditor/doc-html/hglegal.htm
    examples/org.eclipse.ui.examples.multipageeditor/doc-html/ngibmcpy.gif
    examples/org.eclipse.ui.examples.multipageeditor/doc-html/ui_multipageeditor_ex.html
    examples/org.eclipse.ui.examples.multipageeditor/icons/basic/copy.gif
    examples/org.eclipse.ui.examples.multipageeditor/icons/copy.gif
    examples/org.eclipse.ui.examples.multipageeditor/icons/full/copy.gif
    examples/org.eclipse.ui.examples.multipageeditor/plugin.properties
    examples/org.eclipse.ui.examples.multipageeditor/plugin.xml
    examples/org.eclipse.ui.examples.propertysheet/.classpath
    examples/org.eclipse.ui.examples.propertysheet/.cvsignore
    examples/org.eclipse.ui.examples.propertysheet/.vcm_meta
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Address.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Birthday.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddress.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddressValidator.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/GroupElement.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/IUserConstants.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/MessageUtil.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Name.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/OrganizationElement.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PopupMenuActionDelegate.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetContentOutlinePage.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetPlugin.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/StreetAddress.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserEditor.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserFileParser.java
    examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/messages.properties
    examples/org.eclipse.ui.examples.propertysheet/HelpContexts.xml
    examples/org.eclipse.ui.examples.propertysheet/about.html
    examples/org.eclipse.ui.examples.propertysheet/build.properties
    examples/org.eclipse.ui.examples.propertysheet/doc-html/hglegal.htm
    examples/org.eclipse.ui.examples.propertysheet/doc-html/ngibmcpy.gif
    examples/org.eclipse.ui.examples.propertysheet/doc-html/ui_propertysheet_ex.html
    examples/org.eclipse.ui.examples.propertysheet/doc.zip
    examples/org.eclipse.ui.examples.propertysheet/icons/basic/obj16/usereditor.gif
    examples/org.eclipse.ui.examples.propertysheet/icons/full/obj16/usereditor.gif
    examples/org.eclipse.ui.examples.propertysheet/plugin.properties
    examples/org.eclipse.ui.examples.propertysheet/plugin.xml
    examples/org.eclipse.ui.examples.readmetool/.classpath
    examples/org.eclipse.ui.examples.readmetool/.cvsignore
    examples/org.eclipse.ui.examples.readmetool/.vcm_meta
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/AdaptableList.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DefaultSectionsParser.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DirtyStateContribution.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/EditorActionDelegate.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeConstants.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeFileParser.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElement.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElementProperties.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MessageUtil.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/PopupMenuActionDelegate.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlineDragListener.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlinePage.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationPage.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationWizard.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeDropActionDelegate.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditor.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditorActionBarContributor.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage2.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeImages.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePlugin.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePreferencePage.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeSectionsView.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/SectionsDialog.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ViewActionDelegate.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/WindowActionDelegate.java
    examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/messages.properties
    examples/org.eclipse.ui.examples.readmetool/HelpContexts.xml
    examples/org.eclipse.ui.examples.readmetool/about.html
    examples/org.eclipse.ui.examples.readmetool/build.properties
    examples/org.eclipse.ui.examples.readmetool/doc-html/hglegal.htm
    examples/org.eclipse.ui.examples.readmetool/doc-html/ngibmcpy.gif
    examples/org.eclipse.ui.examples.readmetool/doc-html/ui_readmetool_ex.html
    examples/org.eclipse.ui.examples.readmetool/doc.zip
    examples/org.eclipse.ui.examples.readmetool/doc/hglegal.htm
    examples/org.eclipse.ui.examples.readmetool/doc/ngibmcpy.gif
    examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool.html
    examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool_sectionParser.html
    examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action1.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action2.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action3.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/openbrwsr.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/cview16/sections.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action1.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action2.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action3.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/openbrwsr.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action1.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action2.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action3.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/openbrwsr.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/eview16/sections.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/editor.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/newreadme_wiz.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/usereditor.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/view16/sections.gif
    examples/org.eclipse.ui.examples.readmetool/icons/basic/wizban/newreadme_wiz.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action1.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action2.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action3.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/openbrwsr.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/cview16/sections.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action1.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action2.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action3.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/openbrwsr.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action1.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action2.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action3.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/openbrwsr.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/eview16/sections.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/editor.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/newreadme_wiz.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/usereditor.gif
    examples/org.eclipse.ui.examples.readmetool/icons/full/wizban/newreadme_wiz.gif
    examples/org.eclipse.ui.examples.readmetool/plugin.properties
    examples/org.eclipse.ui.examples.readmetool/plugin.xml
    tests/org.eclipse.ui.tests/.classpath
    tests/org.eclipse.ui.tests/.cvsignore
    tests/org.eclipse.ui.tests/.vcm_meta
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/preferences/FontPreferenceTestCase.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AllTests.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ITestModelListener.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredSelectionTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableTreeViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestElement.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestLabelProvider.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModel.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelChange.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelContentProvider.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TreeViewerTest.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddChildAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddElementAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddFilterAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddSiblingAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeChildLabelAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeInputLabelAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeLabelAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ClearSelectionAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/CreateModelAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteChildrenAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteSiblingsAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ExpandAllAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Filter.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/FlushInputAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetFilterAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetSorterAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetLabelProviderAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetSorterAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Sorter.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowser.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowserAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestCheckboxTree.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestList.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestSelectionAction.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTable.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTree.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTree.java
    tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/WorldChangedAction.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/SelectionProviderView.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/TestPlugin.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionBarsTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionDelegateTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionFilterTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IConstants.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionBarContributorTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionDelegateTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorDescriptorTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorLauncherTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorPartTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorRegistryTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorSiteTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IFileEditorMappingTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageListenerTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageServiceTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveDescriptorTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveListenerTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveRegistryTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ISelectionServiceTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewActionDelegateTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewPartTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewSiteTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPageTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartSiteTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowActionDelegateTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListContentProvider.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElement.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElementActionFilter.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListView.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockAction.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockActionDelegate.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionBarContributor.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionDelegate.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorPart.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPartListener.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPropertyListener.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockSelectionProvider.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewActionDelegate.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewPart.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchPart.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchWindowActionDelegate.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/PlatformUITest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionCreateTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionPerspective.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionRestoreTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionView.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportOperationTestCase.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/tests.ini
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferMessagesCopy.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferTestStub.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/NavigatorTestStub.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PreferenceDialogWrapper.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PropertyDialogWrapper.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceMessagesCopy.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceNavigatorMessagesCopy.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TaskListTestStub.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextEditorTestStub.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogs.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferences.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizards.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/ResourceNavigatorTest.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java
    tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java
    tests/org.eclipse.ui.tests/about.html
    tests/org.eclipse.ui.tests/build.properties
    tests/org.eclipse.ui.tests/doc/Introduction.html
    tests/org.eclipse.ui.tests/icons/anything.gif
    tests/org.eclipse.ui.tests/icons/mockeditorpart1.gif
    tests/org.eclipse.ui.tests/icons/mockeditorpart2.gif
    tests/org.eclipse.ui.tests/plugin.xml
    tests/org.eclipse.ui.tests/test.xml
    tests/org.eclipse.ui.tests/uiSniff
    tests/org.eclipse.ui.tests/uiSniff.bat
diff --git a/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java
new file mode 100644
index 0000000..f2110d2
--- /dev/null
+++ b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ActionExpression.java
@@ -0,0 +1,283 @@
+package org.eclipse.ui.internal;

+

+import java.util.*;

+

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

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

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.ui.IActionFilter;

+

+/**

+ * An ActionExpression is used to evaluate the enablement / visibility

+ * criteria for an action.  

+ */

+public class ActionExpression {

+

+	private SingleExpression root;

+	

+	public ActionExpression(IConfigurationElement element) {

+		try {

+			root = new SingleExpression();

+			root.readFrom(element);

+		} catch (IllegalStateException e) {

+			e.printStackTrace();

+			root = null;

+		}

+	}

+	

+	public boolean isEnabledFor(Object object) {

+		if (root == null)

+			return false;

+		return root.isEnabledFor(object);

+	}

+	

+	public boolean isEnabledFor(IStructuredSelection ssel) {

+		if (root == null)

+			return false;

+		if (ssel.isEmpty()) {

+			// We should pass a safe object in when there is no

+			// selection, to avoid NPE's.

+			return root.isEnabledFor(this);

+		}

+		for (Iterator elements=ssel.iterator(); elements.hasNext();) {

+			Object obj = elements.next();

+			if (!isEnabledFor(obj))

+				return false;

+		}

+		return true;

+	}

+

+	protected AbstractExpression createExpression(IConfigurationElement element)

+		throws IllegalStateException 

+	{

+		AbstractExpression childExpr = null;

+		String tag = element.getName();

+		if (tag.equals("or")) { //$NON-NLS-1$

+			childExpr = new OrExpression();

+			childExpr.readFrom(element);

+		} else if (tag.equals("and")) { //$NON-NLS-1$

+			childExpr = new AndExpression();

+			childExpr.readFrom(element);

+		} else if (tag.equals("not")) { //$NON-NLS-1$

+			childExpr = new NotExpression();

+			childExpr.readFrom(element);

+		} else if (tag.equals("objectState")) { //$NON-NLS-1$

+			childExpr = new ObjectStateExpression();

+			childExpr.readFrom(element);

+		} else if (tag.equals("objectClass")) { //$NON-NLS-1$

+			childExpr = new ObjectClassExpression();

+			childExpr.readFrom(element);

+		} else if (tag.equals("pluginState")) { //$NON-NLS-1$

+			childExpr = new PluginStateExpression();

+			childExpr.readFrom(element);

+		} else if (tag.equals("systemProperty")) { //$NON-NLS-1$

+			childExpr = new SystemPropertyExpression();

+			childExpr.readFrom(element);

+		} else {

+			throw new IllegalStateException("Unreconized element: " + tag); //$NON-NLS-1$

+		}

+		return childExpr;

+	}

+	

+	protected abstract class AbstractExpression {

+		public abstract void readFrom(IConfigurationElement element) 

+			throws IllegalStateException;

+		public abstract boolean isEnabledFor(Object obj);

+	}

+	

+	protected abstract class CompositeExpression extends AbstractExpression {

+		protected ArrayList list = new ArrayList();

+		public void readFrom(IConfigurationElement element) 

+			throws IllegalStateException 

+		{

+			IConfigurationElement [] children = element.getChildren();

+			if (children.length == 0)

+				throw new IllegalStateException("Expression must have 1 or more children"); //$NON-NLS-1$

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

+				String tag = children[nX].getName();

+				AbstractExpression expr = createExpression(children[nX]);

+				if (tag.equals("objectClass")) //$NON-NLS-1$

+					prepend(expr);

+				else

+					append(expr);

+			}

+		}

+		public void append(AbstractExpression expr) {

+			list.add(expr);

+			list.trimToSize();

+		}

+		public void prepend(AbstractExpression expr) {

+			list.add(0, expr);

+			list.trimToSize();

+		}

+	}

+	

+	protected class SingleExpression extends AbstractExpression {

+		AbstractExpression child;

+		public void readFrom(IConfigurationElement element) 

+			throws IllegalStateException 

+		{

+			IConfigurationElement [] children = element.getChildren();

+			if (children.length != 1)

+				throw new IllegalStateException("Expression must have 1 child"); //$NON-NLS-1$

+			child = createExpression(children[0]);

+		}

+		public boolean isEnabledFor(Object obj) {

+			return child.isEnabledFor(obj);

+		}

+	}

+	

+	protected class NotExpression extends SingleExpression {

+		public boolean isEnabledFor(Object obj) {

+			return !super.isEnabledFor(obj);

+		}

+	}

+		

+	protected class OrExpression extends CompositeExpression {

+		public boolean isEnabledFor(Object obj) {

+			Iterator iter = list.iterator();

+			while (iter.hasNext()) {

+				AbstractExpression expr = (AbstractExpression)iter.next();

+				if (expr.isEnabledFor(obj))

+					return true;

+			}

+			return false;

+		}

+	}

+	

+	protected class AndExpression extends CompositeExpression {

+		public boolean isEnabledFor(Object obj) {

+			Iterator iter = list.iterator();

+			while (iter.hasNext()) {

+				AbstractExpression expr = (AbstractExpression)iter.next();

+				if (!expr.isEnabledFor(obj))

+					return false;

+			}

+			return true;

+		}

+	}

+

+	protected class ObjectStateExpression extends AbstractExpression {

+		private String name, value;

+		public void readFrom(IConfigurationElement element) 

+			throws IllegalStateException

+		{

+			name = element.getAttribute("name");//$NON-NLS-1$

+			value = element.getAttribute("value");//$NON-NLS-1$

+			if (name == null || value == null)

+				throw new IllegalStateException();

+		}

+		public boolean isEnabledFor(Object object) {

+			// Try out the object.

+			if (this.preciselyMatches(object))

+				return true;

+				

+			// If not adaptable, or the object is a resource, just return.

+			if (object instanceof IResource)

+				return false;

+				

+			// Try out the underlying resource.

+			IResource res = null;

+			if (object instanceof IAdaptable)

+				res = (IResource)((IAdaptable)object).getAdapter(IResource.class);

+			if (res == null)

+				return false;

+			return this.preciselyMatches(res);

+		}

+		private boolean preciselyMatches(Object object) {

+			// Get the action filter.

+			IActionFilter filter = null;

+			if (object instanceof IActionFilter)

+				filter = (IActionFilter)object;

+			else if (object instanceof IAdaptable)

+				filter = (IActionFilter)((IAdaptable)object).getAdapter(IActionFilter.class);

+			if (filter == null)

+				return false;

+				

+			// Run the action filter.

+			return filter.testAttribute(object, name, value);

+		}

+	}

+

+	protected class ObjectClassExpression extends AbstractExpression {

+		private String className;

+		public void readFrom(IConfigurationElement element) 

+			throws IllegalStateException

+		{

+			className = element.getAttribute("name");//$NON-NLS-1$

+			if (className == null)

+				throw new IllegalStateException();

+		}

+		public boolean isEnabledFor(Object element) {

+			Class eclass = element.getClass();

+			String eclassName = eclass.getName();

+			Class clazz = eclass;

+			boolean match = false;

+			while (clazz != null) {

+				// test the class itself

+				if (clazz.getName().equals(className)) {

+					match = true;

+					break;

+				}

+				// test all the interfaces it implements

+				Class[] interfaces = clazz.getInterfaces();

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

+					if (interfaces[i].getName().equals(className)) {

+						match = true;

+						break;

+					}

+				}

+				if (match == true)

+					break;

+				// get the superclass

+				clazz = clazz.getSuperclass();

+			}

+			return match;

+		}

+	}

+

+	protected class PluginStateExpression extends AbstractExpression {

+		private String id, value;

+		public void readFrom(IConfigurationElement element) 

+			throws IllegalStateException

+		{

+			id = element.getAttribute("id");//$NON-NLS-1$

+			value = element.getAttribute("value");//$NON-NLS-1$

+			if (id == null || value == null)

+				throw new IllegalStateException();

+		}

+		public boolean isEnabledFor(Object object) {

+			IPluginRegistry reg = Platform.getPluginRegistry();

+			IPluginDescriptor desc = reg.getPluginDescriptor(id);

+			if (desc == null)

+				return false;

+			if (value.equals("installed")) //$NON-NLS-1$

+				return true;

+			else if (value.equals("activated")) //$NON-NLS-1$

+				return desc.isPluginActivated();

+			else 

+				return false;

+		}

+	}

+

+	protected class SystemPropertyExpression extends AbstractExpression {

+		private String name, value;

+		public void readFrom(IConfigurationElement element) 

+			throws IllegalStateException

+		{

+			name = element.getAttribute("name");//$NON-NLS-1$

+			value = element.getAttribute("value");//$NON-NLS-1$

+			if (name == null || value == null)

+				throw new IllegalStateException();

+		}

+		public boolean isEnabledFor(Object object) {

+			String str = System.getProperty(name);

+			if (str == null)

+				return false;

+			boolean b = value.equals(str);

+			return b;

+		}

+	}

+

+}

+

diff --git a/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/DecoratorActionFactory.java b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/DecoratorActionFactory.java
new file mode 100644
index 0000000..7fa4056
--- /dev/null
+++ b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/DecoratorActionFactory.java
@@ -0,0 +1,48 @@
+package org.eclipse.ui.internal;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.ui.views.navigator.LabelDecoratorAction;

+import org.eclipse.ui.views.navigator.ResourceNavigatorMessages;

+

+/**

+ * The DecoratorActionFactory builds the actions for the 

+ * decorator functions.

+ */

+

+public class DecoratorActionFactory {

+

+	LabelDecoratorAction[] actions;

+	/*

+	 * @see ActionFactory#makeActions()

+	 */

+	public void makeActions() {

+		//Make an action for each decorator definition

+		DecoratorDefinition[] definitions =

+			WorkbenchPlugin.getDefault().getDecoratorManager().getDecoratorDefinitions();

+		actions = new LabelDecoratorAction[definitions.length];

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

+			DecoratorDefinition definition = definitions[i];

+			actions[i] =

+				new LabelDecoratorAction(definition);

+		}

+		

+	}

+	

+	/**

+	 * Fill the supplied menu with entries for the decorators.

+	 */

+	public void fillMenu(IMenuManager menu) {

+		

+		IMenuManager submenu =

+			new MenuManager(ResourceNavigatorMessages.getString("DecoratorMenu.title"));

+		//$NON-NLS-1$

+		menu.add(submenu);

+		

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

+			submenu.add(actions[i]);

+		}

+		

+	}

+

+}

+

diff --git a/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ObjectFilterTest.java b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ObjectFilterTest.java
new file mode 100644
index 0000000..ba12292
--- /dev/null
+++ b/bundles/org.eclipse.ui/Eclipse UI/org/eclipse/ui/internal/ObjectFilterTest.java
@@ -0,0 +1,103 @@
+package org.eclipse.ui.internal;

+import java.util.*;

+

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

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

+import org.eclipse.ui.IActionFilter;

+

+/**

+ * An ObjectFilterTest is used to read an object filter from XML,

+ * and evaluate the results for a given object.

+ */

+public class ObjectFilterTest {

+	private HashMap filterElements;

+

+	/**

+	 * Create a new object filter. 

+	 */	

+	public ObjectFilterTest() {

+	}

+	

+	/**

+	 * Add a filter element to the test.  This element must contain

+	 * a name value filter pair, as defined by the 

+	 * <code>org.eclipse.ui.actionFilters</code> extension point.

+	 */

+	public boolean addFilterElement(IConfigurationElement element) {

+		String name = element.getAttribute("name");//$NON-NLS-1$

+		if (name == null)

+			return false;

+		

+		// Get positive property.

+		String value = element.getAttribute("value");//$NON-NLS-1$

+		if (value == null)

+			return false;

+		if (filterElements==null) 

+			filterElements = new HashMap();

+		filterElements.put(name, value);

+		return true;

+	}

+	

+	/**

+	 * Returns whether the object filter correctly matches a

+	 * given object.  The results will be <code>true</code> if there is

+	 * a filter match.  

+	 * <p>

+	 * If <code>adaptable is true</code>, the result will also be

+	 * <code>rue</code> if the object is a wrapper for a resource, and

+	 * the resource produces a filter match.

+	 * </p>

+	 * 

+	 * @param object the object to examine

+	 * @returns <code>true</code> if there is a filter match.  

+	 */

+	public boolean matches(Object object, boolean adaptable) {

+		// Optimize it.

+		if (filterElements == null)

+			return true;

+			

+		// Try out the object.

+		if (this.preciselyMatches(object))

+			return true;

+			

+		// If not adaptable, or the object is a resource, just return.

+		if (!adaptable)

+			return false;

+		if (object instanceof IResource)

+			return false;

+			

+		// Try out the underlying resource.

+		IResource res = null;

+		if (object instanceof IAdaptable)

+			res = (IResource)((IAdaptable)object).getAdapter(IResource.class);

+		if (res == null)

+			return false;

+		return this.preciselyMatches(res);

+	}

+

+	/**

+	 * Returns whether the object filter correctly matches a given object.

+	 */

+	private boolean preciselyMatches(Object object) {

+		// Get the action filter.

+		IActionFilter filter = null;

+		if (object instanceof IActionFilter)

+			filter = (IActionFilter)object;

+		else if (object instanceof IAdaptable)

+			filter = (IActionFilter)((IAdaptable)object).getAdapter(IActionFilter.class);

+		if (filter == null)

+			return false;

+			

+		// Run the action filter.

+		Iterator iter = filterElements.keySet().iterator();

+		while (iter.hasNext()) {

+			String name = (String)iter.next();

+			String value = (String)filterElements.get(name);

+			if (!filter.testAttribute(object, name, value))

+				return false;

+		}

+		return true;

+	}

+}

+

+

diff --git a/bundles/org.eclipse.ui/doc/expressions.html b/bundles/org.eclipse.ui/doc/expressions.html
new file mode 100644
index 0000000..42df385
--- /dev/null
+++ b/bundles/org.eclipse.ui/doc/expressions.html
@@ -0,0 +1,332 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

+<html>

+<head>

+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

+   <meta name="GENERATOR" content="Mozilla/4.5 [en] (WinNT; I) [Netscape]">

+   <title>Eclipse Workbench Extension Point: Action Sets</title>

+</head>

+<body link="#0000FF" vlink="#800080">

+

+<center>

+<h1>

+Expressions</h1></center>

+<b><i>Description: </i></b>Boolean expressions are used to define the visibility

+and enablement for many action extensions within the workbench.&nbsp; For

+instance, an <i>enablement</i> element can be defined within any action

+extension.&nbsp; This element contains a boolean expression defining the

+enablement criteria for the action.&nbsp; A <i>visibility</i> element can

+be defined for a popup menu action extension.&nbsp; This element contains

+a boolean expression defining the visibility criteria for the action.

+<p>Regardless of where the boolean expression is found, the syntax of the

+expression will follow the same form.&nbsp; The root element for enablement

+and visibility must contain one sub element.&nbsp; In the simplest case,

+this will consist of an <i>objectClass</i>, <i>objectState</i>, <i>systemProperty</i>,

+or <i>pluginState</i> element.&nbsp; In the more complex case, <i>and</i>,

+<i>or</i>, not elements can be combined to form a boolean expression.&nbsp;

+An <i>and</i> or <i>or</i> element may contain 1 or more sub elements.&nbsp;

+A <i>not</i> element must contain only 1 sub element.

+<p>An <i>objectClass</i> element is used to evaluate the class of each

+object in the selection.&nbsp; The name attribute of the objectClass contains

+a fully qualified class name.&nbsp; If each object in the selection implements

+this class, the expression is evaluated as true.

+<p>An <i>objectState</i> element is used to evaluate the state of each

+object in the selection.&nbsp; In most situations, the enablement or visibility

+of an action can be determined by selection type.&nbsp; In other situations

+this is not enough, and enablement or visibility must be determined using

+the selection state.&nbsp; For instance, you may contribute an action for

+all objects of type <tt>IFile</tt> which are read only. This read only

+criteria can only be declared by specifying an <i>objectState</i> element.&nbsp;

+It may have the following form ..

+<br>&nbsp;

+<blockquote><tt>&lt;objectState name="readOnly" value="true"/></tt></blockquote>

+In the workbench, the evaluation of this expression is very difficult to

+accomplish, because the attributes of an object are type specific, and

+beyond the domain of the workbench itself.&nbsp; So the workbench will

+collaborate with the objects in the selection to evaluate the expression.&nbsp;

+This is done using an <tt>IActionFilter</tt>, an evaluation strategy for

+<i>objectState</i> elements.&nbsp; When an objectState element is evaluated,

+the workbench ask each object in the selection for an <tt>IActionFilter</tt>.&nbsp;

+It does this by testing to see if it implements <tt>IActionFilter</tt>.&nbsp;

+If that fails, the workbench will ask for a filter through through the

+<tt>IAdaptable</tt> mechanism.&nbsp; If a filter is found, the workbench

+will pass the <i>objectState</i> attributes to the filter to determine

+if they match the state of the selected object.&nbsp; If so, the term is

+evaluated as true.&nbsp; If there is no action filter, or there is no match,

+the term is evaluated as false.

+<p>View and editors are encouraged to define an <tt>IActionFilter</tt>

+for each object in their selection.&nbsp; This makes it easier for other

+plugin developers to extend those views or editors with new, well qualified

+actions.

+<p>A <i>systemProperty</i> element is used to evaluate the state of some

+system property.&nbsp; Under the covers, the value of the system property

+is determined by invoking System.getProperty.

+<p>A <i>pluginState</i> element is used to evaluate the state of a plugin.&nbsp;

+The state of the plugin may be installed or activated.

+<p><b><i>Configuration Markup:</i></b>

+<p><tt>&nbsp;&nbsp; &lt;!ELEMENT visibility (and | or | not | objectClass

+| objectState | systemProperty</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | pluginState)></tt><tt></tt>

+<p><tt>&nbsp;&nbsp; &lt;!ELEMENT enablement (and | or | not | objectClass

+| objectState | systemProperty</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | pluginState)></tt><tt></tt>

+<p><tt>&nbsp;&nbsp; &lt;!ELEMENT and (and | or | not | objectClass | objectState

+| systemProperty | pluginState)*></tt><tt></tt>

+<p><tt>&nbsp;&nbsp; &lt;!ELEMENT or (and | or | not | objectClass | objectState

+| systemProperty | pluginState)*></tt><tt></tt>

+<p><tt>&nbsp;&nbsp; &lt;!ELEMENT not (and | or | not | objectClass | objectState

+| systemProperty | pluginState)></tt><tt></tt>

+<p><tt>&nbsp;&nbsp; &lt;!ELEMENT objectClass EMPTY></tt>

+<br><tt>&nbsp;&nbsp; &lt;!ATTLIST objectClass</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA #REQUIRED</tt>

+<br><tt>&nbsp;&nbsp; ></tt>

+<ul>

+<li>

+<b>name</b> - a fully qualified name of a class.&nbsp; The expression is

+evaluated as true only if the selection implement this class.</li>

+</ul>

+<tt>&nbsp;&nbsp; &lt;!ELEMENT objectState EMPTY></tt>

+<br><tt>&nbsp;&nbsp; &lt;!ATTLIST objectState</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA #REQUIRED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; value&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA #REQUIRED</tt>

+<br><tt>&nbsp;&nbsp; ></tt>

+<ul>

+<li>

+<b>name </b>- the name of an object attribute.&nbsp; Acceptable values

+for this string reflect the object type, and should be publicly declared

+by the plugin where the object type is declared.</li>

+

+<li>

+<b>value</b> - the required value of the object attribute.&nbsp; The acceptable

+values for the object attribute should be publicly declared.</li>

+</ul>

+<tt>&nbsp;&nbsp; &lt;!ELEMENT systemProperty EMPTY></tt>

+<br><tt>&nbsp;&nbsp; &lt;!ATTLIST systemProperty</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA #REQUIRED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; value&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA #REQUIRED</tt>

+<br><tt>&nbsp;&nbsp; ></tt>

+<ul>

+<li>

+<b>name </b>- the name of the system property.</li>

+

+<li>

+<b>value</b> - the required value of the system property.</li>

+</ul>

+<tt>&nbsp;&nbsp; &lt;!ELEMENT pluginState EMPTY></tt>

+<br><tt>&nbsp;&nbsp; &lt;!ATTLIST pluginState</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA #REQUIRED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; value&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+(installed | activated)</tt>

+<br><tt>&nbsp;&nbsp; ></tt>

+<blockquote>

+<li>

+<b>id </b>- an id of a plugin which may or may not be registered in the

+plug-in registry.</li>

+

+<li>

+<b>value</b> - the required state of the plugin.&nbsp; Currently two states

+are supported: installed and activated.</li>

+</blockquote>

+<b><i>Examples:</i></b>

+<p>The following is an example of an action set which uses the enablement

+element.&nbsp; The action set declares a menu with the label List Element,

+and then populates it with actions which are enabled by a selection of

+<tt>ListElements</tt> with various state.&nbsp; A <tt>ListElement</tt>

+has two attributes: <i>name</i> (a string) and <i>flag</i> (a boolean).&nbsp;

+In this example, the All action (<img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_a.jpg" height=13 width=24 align=ABSCENTER>)

+is enabled whenever a ListElement is selected.&nbsp; The Red action (<img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_b.jpg" height=13 width=24 align=ABSCENTER>)

+is enabled when a ListElement with name = red is selected.&nbsp; And the

+Not Red action (<img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_c.jpg" height=13 width=24 align=ABSCENTER>)

+is enabled when a ListElement with name != red is selected.

+<blockquote><tt>&lt;extension point = "org.eclipse.ui.actionSets"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;actionSet id="org.eclipse.ui.tests.internal.ListElementActions"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; label="List Element"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;menu id="org.eclipse.ui.tests.internal.ListElementMenu"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="List Element"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+path="additions"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;separator name="group1"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/menu></tt>

+<br><img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_a.jpg" height=13 width=24 align=ABSCENTER><tt>&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;action id="org.eclipse.ui.tests.internal.ac1"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="All"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+menubarPath="org.eclipse.ui.tests.internal.ListElementMenu/group1"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+class="org.eclipse.ui.tests.api.MockActionDelegate"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+enablesFor="1"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;objectClass name="org.eclipse.ui.tests.api.ListElement"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/action></tt>

+<br><img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_b.jpg" height=13 width=24 align=ABSCENTER><tt>&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;action id="org.eclipse.ui.tests.internal.ac2"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="Red"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+menubarPath="org.eclipse.ui.tests.internal.ListElementMenu/group1"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+class="org.eclipse.ui.tests.api.MockActionDelegate"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+enablesFor="1"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;and></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;objectClass name="org.eclipse.ui.tests.api.ListElement"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;objectState name="name" value="red"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/and></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/action></tt>

+<br><img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_c.jpg" height=13 width=24 align=ABSCENTER><tt>&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;action id="org.eclipse.ui.tests.internal.ac3"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="Not Red"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+menubarPath="org.eclipse.ui.tests.internal.ListElementMenu/group1"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+class="org.eclipse.ui.tests.api.MockActionDelegate"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+enablesFor="1"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;and></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;objectClass name="org.eclipse.ui.tests.api.ListElement"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;not></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;objectState name="name" value="red"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/not></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/and></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/action></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;/actionSet></tt>

+<br><tt>&lt;/extension></tt></blockquote>

+In the next example the <i>pluginState</i> element is used to control the

+enablement of actions in an action set.&nbsp; The Installed action (<img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_a.jpg" height=13 width=24 align=ABSCENTER>)

+is enabled when the plugin with <tt>x.y.z.myPlugin</tt> is installed.&nbsp;

+The Activated action (<img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_b.jpg" height=13 width=24 align=ABSCENTER>)

+is enabled when the same plugin has been activated.

+<blockquote><tt>&lt;extension point = "org.eclipse.ui.actionSets"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;actionSet id="org.eclipse.ui.tests.internal.ListElementActions"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; label="List Element"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;menu id="org.eclipse.ui.tests.internal.ListElementMenu"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="List Element"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+path="additions"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;separator name="group1"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/menu></tt>

+<br><img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_a.jpg" height=13 width=24 align=ABSCENTER><tt>&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;action id="org.eclipse.ui.tests.internal.ac8"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="Installed"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+menubarPath="org.eclipse.ui.tests.internal.ListElementMenu/group1"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+class="org.eclipse.ui.tests.api.MockActionDelegate"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;pluginState id="x.y.z.myPlugin" value="installed"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/action></tt>

+<br><img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_b.jpg" height=13 width=24 align=ABSCENTER><tt>&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;action id="org.eclipse.ui.tests.internal.ac10"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="Activated"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+menubarPath="org.eclipse.ui.tests.internal.ListElementMenu/group1"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+class="org.eclipse.ui.tests.api.MockActionDelegate"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;pluginState id="x.y.z.myPlugin" value="activated"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/action></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;/actionSet></tt>

+<br><tt>&lt;/extension></tt></blockquote>

+In the next example the systemProperty element is demonstrated.&nbsp; The

+System Property action (<img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_a.jpg" height=13 width=24 align=ABSCENTER>)

+is enabled when the ActionExpressionVar system property is equal to "bubba".

+<blockquote><tt>&lt;extension point = "org.eclipse.ui.actionSets"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;actionSet id="org.eclipse.ui.tests.internal.ListElementActions"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; label="List Element"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;menu id="org.eclipse.ui.tests.internal.ListElementMenu"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="List Element"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+path="additions"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;separator name="group1"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/menu></tt>

+<br><img SRC="../../org.eclipse.ui.articles.guidelines/doc/images/tag_a.jpg" height=13 width=24 align=ABSCENTER><tt>&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;action id="org.eclipse.ui.tests.internal.ac11"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+label="System Property"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+menubarPath="org.eclipse.ui.tests.internal.ListElementMenu/group1"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+class="org.eclipse.ui.tests.api.MockActionDelegate"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;systemProperty name="ActionExpressionVar" value="bubba"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;/enablement></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/action></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;/actionSet></tt>

+<br><tt>&lt;/extension></tt></blockquote>

+Here is one final example, which demonstrates the declaration of visibility

+for a popup menu action extension.&nbsp; The Red and True action is visible

+whenever a <tt>ListElement</tt> is selected with <i>name = red</i> and

+<i>flag = true</i>.

+<blockquote><tt>&lt;extension point="org.eclipse.ui.popupMenus"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;objectContribution id="oc6"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; objectClass="org.eclipse.ui.tests.api.ListElement"></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;visibility></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;and></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;objectState name="name" value="red"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&lt;objectState name="flag" value="true"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/and></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/visibility></tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;action id="oc4" label="Red And

+True"</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class="org.eclipse.ui.tests.api.MockActionDelegate"/></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;/objectContribution></tt>

+<br><tt>&lt;/extension></tt></blockquote>

+

+<p><br><b><i>Supplied Implementation:</i></b> For convenience, action filters

+have been defined for markers, resources, and projects.&nbsp; The name-value

+pairs for each are declared on <tt>IMarkerActionFilter</tt>, <tt>IResourceActionFilter</tt>,

+and <tt>IProjectActionFilter</tt>.

+<br>&nbsp;

+<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

+</body>

+</html>

diff --git a/bundles/org.eclipse.ui/doc/org_eclipse_ui_decorators.html b/bundles/org.eclipse.ui/doc/org_eclipse_ui_decorators.html
new file mode 100644
index 0000000..006e7de
--- /dev/null
+++ b/bundles/org.eclipse.ui/doc/org_eclipse_ui_decorators.html
@@ -0,0 +1,82 @@
+

+

+<center>

+<h1>

+Decorators</h1></center>

+<b><i>Identifier: </i></b>org.eclipse.ui.decorators

+<p><b><i>Description: </i></b>This extension point is used to add decorators to

+views that subscribe to a decorator manager.

+<p><b><i>Configuration Markup:</i></b>

+<p><tt>&nbsp;&nbsp; &lt;!ELEMENT decorator &gt;</tt>

+<br><tt>&nbsp;&nbsp; &lt;!ATTLIST actionSet</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA #REQUIRED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; label&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA

+#REQUIRED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; state&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+(true | false)

+#IMPLIED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+CDATA

+#REQUIRED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; objectClass&nbsp;&nbsp; CDATA

+#REQUIRED</tt>

+<br><tt>&nbsp;&nbsp;&nbsp; ></tt>

+<br><tt>&nbsp;&nbsp;&nbsp; &lt;!ELEMENT description (#PCDATA)></tt>

+<ul>

+<li>

+<b>id</b> - a unique name that will be used to identify this action set.</li>

+

+<li>

+<b>label</b> - a translatable name that will be used in the workbench window

+menu to represent this decorator.</li>

+

+<li>

+<b>state</b> - an optional attribute indicating whether the decorator should be

+initially enabled. The enabled state can be toggled using the

+Window-&gt;Decorators meny.</li>

+

+<li>

+<b>class</b> - a fully qualified name of a class which implements <tt>org.eclipse.jface.viewers.ILabelDecorator</tt></li>

+

+<li>

+<tt><b>objectClass</b> - </tt> a fully qualified name of a class which this

+decorator will be applied to</li>

+

+<li>

+<b>description</b> - an optional subelement whose body should contain text

+providing short description of the decorator</li>

+</ul>

+<tt>&nbsp;</tt><b><i>Example:</i></b>

+<p>The following is an example of an action set (note the subelements and

+the way attributes are used):

+<p><tt>&lt;extension</tt> <tt>point=&quot;org.eclipse.ui.decorators&quot;&gt;</tt>

+<br>&nbsp;&nbsp;&nbsp;<tt>&nbsp;&nbsp;&nbsp;&nbsp; &lt;decorator</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;</tt>

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&nbsp;&nbsp;</tt>

+ <tt>id=&quot;com.xyz.decorator&quot;</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;</tt>

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&nbsp;&nbsp;</tt>

+ <tt>label=&quot;XYZ Decorator&quot;</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;</tt>

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <tt>state=&quot;true&quot;</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class=&quot;com.xyz.DecoratorContributor&quot;</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;</tt>

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&nbsp;&nbsp;</tt>

+ <tt>objectClass=&quot;org.eclipse.core.resources.IResource&quot;&gt;</tt>

+<br><tt>&nbsp;&nbsp;&nbsp;</tt>

+&nbsp;&nbsp;&nbsp;&nbsp; <tt>&lt;/decorator &gt;</tt>

+<br><tt>&lt;/extension&gt;</tt>

+<p><b><i>API Information: </i></b>The value of the <tt>class</tt> attribute

+must be the fully qualified name of a class that implements <tt>org.eclipse.jface.viewers.ILabelDecorator.</tt>&nbsp;

+This class is loaded as late as possible to avoid loading the entire plug-in

+before it is really needed.<p><b><i>Supplied Implementation:</i></b> Plug-ins may use this extension

+point to add new decorators to be applied to views that use the decorator

+manager as thier label decorator. To use the decorator manager use the result of

+IViewPart.getDecoratorManager() as the decorator for an instance of

+DecoratingLabelProvider. This is currently in use by the ResourceNavigator.

+<p>The Decorators can be toggled on or off by selecting them in the

+Window-&gt;Decorators menu.

+<br>&nbsp;

+<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

diff --git a/bundles/org.eclipse.ui/doc/tag_a.jpg b/bundles/org.eclipse.ui/doc/tag_a.jpg
new file mode 100644
index 0000000..3728217
--- /dev/null
+++ b/bundles/org.eclipse.ui/doc/tag_a.jpg
Binary files differ
diff --git a/bundles/org.eclipse.ui/doc/tag_b.jpg b/bundles/org.eclipse.ui/doc/tag_b.jpg
new file mode 100644
index 0000000..a7903ad
--- /dev/null
+++ b/bundles/org.eclipse.ui/doc/tag_b.jpg
Binary files differ
diff --git a/bundles/org.eclipse.ui/doc/tag_c.jpg b/bundles/org.eclipse.ui/doc/tag_c.jpg
new file mode 100644
index 0000000..03516e7
--- /dev/null
+++ b/bundles/org.eclipse.ui/doc/tag_c.jpg
Binary files differ
diff --git a/bundles/org.eclipse.ui/doc/tag_d.jpg b/bundles/org.eclipse.ui/doc/tag_d.jpg
new file mode 100644
index 0000000..8c27fb5
--- /dev/null
+++ b/bundles/org.eclipse.ui/doc/tag_d.jpg
Binary files differ
diff --git a/bundles/org.eclipse.ui/doc/tag_e.jpg b/bundles/org.eclipse.ui/doc/tag_e.jpg
new file mode 100644
index 0000000..c28f7ce
--- /dev/null
+++ b/bundles/org.eclipse.ui/doc/tag_e.jpg
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/.classpath b/examples/org.eclipse.ui.examples.multipageeditor/.classpath
deleted file mode 100644
index 2470fa8..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="Eclipse UI Examples MultiPageEditor"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtime.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtimesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resources.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resourcessrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt/swt.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.swt/swtsrc.zip"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/.cvsignore b/examples/org.eclipse.ui.examples.multipageeditor/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/.vcm_meta b/examples/org.eclipse.ui.examples.multipageeditor/.vcm_meta
deleted file mode 100644
index 87a5505..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/.vcm_meta
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<nature id="org.eclipse.jdt.core.javanature"/>

-	<reference project-name="org.eclipse.ui"/>

-	<builder name="org.eclipse.jdt.core.javabuilder">

-	</builder>

-</project-description>

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MessageUtil.java b/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MessageUtil.java
deleted file mode 100644
index dd14ee4..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MessageUtil.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.ui.examples.multipageeditor;

-

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-/**

- * Utility class which helps with managing messages.

- */

-/* package */ class MessageUtil {

-

-	private static final String RESOURCE_BUNDLE= "org.eclipse.ui.examples.multipageeditor.messages";//$NON-NLS-1$

-

-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-	private MessageUtil() {

-		// prevent instantiation of class

-	}

-

-	/**

-	 * Returns the formatted message for the given key in

-	 * the resource bundle. 

-	 *

-	 * @param key the resource name

-	 * @param args the message arguments

-	 * @return the string

-	 */	

-	public static String format(String key, Object[] args) {

-		return MessageFormat.format(getString(key),args);

-	}

-

-	/**

-	 * Returns the resource object with the given key in

-	 * the resource bundle. If there isn't any value under

-	 * the given key, the key is returned, surrounded by '!'s.

-	 *

-	 * @param key the resource name

-	 * @return the string

-	 */	

-	public static String getString(String key) {

-		try {

-			return fgResourceBundle.getString(key);

-		} catch (MissingResourceException e) {

-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$

-		}

-	}

-}

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageContributor.java b/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageContributor.java
deleted file mode 100644
index d78f61a..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageContributor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.ui.examples.multipageeditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorPart;

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

-import org.eclipse.ui.texteditor.ITextEditor;

-import org.eclipse.ui.texteditor.ITextEditorActionConstants;

-import org.eclipse.ui.IWorkbenchActionConstants;

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

-

-/**

- * 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 MultiPageContributor extends MultiPageEditorActionBarContributor {

-	private IEditorPart activeEditorPart;

-/**

- * Creates a multi-page contributor.

- */

-public MultiPageContributor() {

-	super();

-}

-/**

- * Returns the action registed with the given text editor.

- * @return IAction or null if editor is null.

- */

-protected IAction getAction(ITextEditor editor, String actionID) {

-	return (editor == null ? null : editor.getAction(actionID));

-}

-/* (non-JavaDoc)

- * Method declared in AbstractMultiPageEditorActionBarContributor.

- */

- 

-public void setActivePage(IEditorPart part) {

-	if (activeEditorPart == part)

-		return;

-

-	activeEditorPart = part;

-

-	IActionBars actionBars = getActionBars();

-	if (actionBars != null) {

-

-		ITextEditor editor = (part instanceof ITextEditor) ? (ITextEditor) part : null;

-

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.DELETE, getAction(editor, ITextEditorActionConstants.DELETE));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.UNDO, getAction(editor, ITextEditorActionConstants.UNDO));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.REDO, getAction(editor, ITextEditorActionConstants.REDO));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.CUT, getAction(editor, ITextEditorActionConstants.CUT));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.COPY, getAction(editor, ITextEditorActionConstants.COPY));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PASTE, getAction(editor, ITextEditorActionConstants.PASTE));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.SELECT_ALL, getAction(editor, ITextEditorActionConstants.SELECT_ALL));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.FIND, getAction(editor, ITextEditorActionConstants.FIND));

-		actionBars.setGlobalActionHandler(IWorkbenchActionConstants.BOOKMARK, getAction(editor, ITextEditorActionConstants.BOOKMARK));

-		actionBars.updateActionBars();

-	}

-}

-}

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageEditorExample.java b/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageEditorExample.java
deleted file mode 100644
index 72d3ca4..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/MultiPageEditorExample.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.eclipse.ui.examples.multipageeditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

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

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

-import org.eclipse.ui.*;

-import org.eclipse.ui.editors.text.TextEditor;

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

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

-import org.eclipse.swt.SWT;

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

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

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

-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.layout.FillLayout;

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

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

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

-import java.io.StringWriter;

-import java.text.Collator;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.StringTokenizer;

-

-/**

- * 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 MultiPageEditorExample extends MultiPageEditorPart {

-

-	/** 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 MultiPageEditorExample() {

-	super();

-}

-/**

- * 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(), MessageUtil.getString("ErrorCreatingNestedEditor"), null, e.getStatus()); //$NON-NLS-1$

-	}

-}

-/**

- * 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(MessageUtil.getString("ChangeFont")); //$NON-NLS-1$

-

-	fontButton.addSelectionListener(new SelectionAdapter() {

-		public void widgetSelected(SelectionEvent event) {

-			setFont();

-		}

-	});

-

-	int index = addPage(composite);

-	setPageText(index, MessageUtil.getString("Properties")); //$NON-NLS-1$

-}

-/**

- * 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, MessageUtil.getString("Preview")); //$NON-NLS-1$

-}

-/**

- * Creates the pages of the multi-page editor.

- */

-protected void createPages() {

-	createPage0();

-	createPage1();

-	createPage2();

-}

-/**

- * Saves the multi-page editor's document.

- */

-public void doSave(IProgressMonitor monitor) {

-	getEditor(0).doSave(monitor);

-}

-/**

- * Saves the multi-page editor's document as another file.

- * Also updates the text for page 0's tab, and updates this multi-page editor's input

- * to correspond to the nested editor's.

- */

-public void doSaveAs() {

-	IEditorPart editor = getEditor(0);

-	editor.doSaveAs();

-	setPageText(0, editor.getTitle());

-	setInput(editor.getEditorInput());

-}

-/* (non-Javadoc)

- * Method declared on IEditorPart

- */

-public void gotoMarker(IMarker marker) {

-	setActivePage(0);

-	getEditor(0).gotoMarker(marker);

-}

-/**

- * The <code>MultiPageEditorExample</code> implementation of this method

- * checks that the input is an instance of <code>IFileEditorInput</code>.

- */

-public void init(IEditorSite site, IEditorInput editorInput) throws PartInitException {

-	if (!(editorInput instanceof IFileEditorInput)) 

-		throw new PartInitException(MessageUtil.getString("InvalidInput")); //$NON-NLS-1$

-	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();

-	}

-}

-/**

- * Sets the font related data to be applied to the text in page 2.

- */

-void setFont() {

-	FontDialog fontDialog = new FontDialog(getSite().getShell());

-	fontDialog.setFontData(text.getFont().getFontData()[0]);

-	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!@#$%^&*()-_=+`~[]{};:'\",.<>/?|\\"); //$NON-NLS-1$

-	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("\n"); //$NON-NLS-1$

-	}

-	text.setText(displayText.toString());

-}

-}

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/messages.properties b/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/messages.properties
deleted file mode 100644
index a0f968a..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/Eclipse UI Examples MultiPageEditor/org/eclipse/ui/examples/multipageeditor/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-ErrorCreatingNestedEditor=Error creating nested text editor

-ChangeFont=Change Font...

-InvalidInput=Invalid Input: Must be IFileEditorInput

-Preview=Preview

-Properties=Properties

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/about.html b/examples/org.eclipse.ui.examples.multipageeditor/about.html
deleted file mode 100644
index 9a15e5c..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body>

-<body lang=EN-US link=blue vlink=purple>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">About This Plug-in</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>1st November, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org makes available all content in this plug-in.  The plug-in is provided to you under the terms and conditions of the

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a>.  For purposes of the Common Public License, &quot;Program&quot; will mean the plug-in.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/build.properties b/examples/org.eclipse.ui.examples.multipageeditor/build.properties
deleted file mode 100644
index 21447bc..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.multipageeditor.jar = Eclipse UI Examples MultiPageEditor/

-

-bin.includes = doc-html/,\

-				icons/,\

-				.options,\

-				about.html,\

-				plugin.properties,\

-				plugin.xml,\

-				*.jar

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/doc-html/hglegal.htm b/examples/org.eclipse.ui.examples.multipageeditor/doc-html/hglegal.htm
deleted file mode 100644
index b071dbd..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/doc-html/hglegal.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]">

-   <title>Legal Notices</title>

-</head>

-<body>

-

-<h3>

-<a NAME="Notices"></a>Notices</h3>

-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/doc-html/ngibmcpy.gif b/examples/org.eclipse.ui.examples.multipageeditor/doc-html/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/doc-html/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/doc-html/ui_multipageeditor_ex.html b/examples/org.eclipse.ui.examples.multipageeditor/doc-html/ui_multipageeditor_ex.html
deleted file mode 100644
index a610d18..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/doc-html/ui_multipageeditor_ex.html
+++ /dev/null
@@ -1,50 +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>Desktop - Multi-page Editor Example</title>

-</head>

-<body>

-

-<h2>

-<b>Example - Multi-page Editor</b></h2>

-

-<h3>

-Introduction</h3>

-The&nbsp; Multi Page Editor Example adds an editor for files with the .mpe

-extension. It shows how to create an editor that uses multiple pages by

-defining both an editor and a page contributor that can add entries to

-an action bar.

-<h3>

-Running the example</h3>

-To start using the Multi-page Editor Example, create a new file with .mpe

-extension.&nbsp; Select the file, bring up the popup menu, select the Open

-With menu and from the sub-menu select the Multi Page Editor Example menu

-item. You can then select the different editors by selecting the different

-tabs.

-<h4>

-<b>Creating a new mpe file</b></h4>

-Create a new file with file extension .mpe.&nbsp; From the File menu, select

-New and then select Other... from the sub-menu.&nbsp; Click on Simple in

-the wizard, then select

-<br>File in the list on the left.&nbsp; Click on Next to supply the file

-name (make sure the extension is .mpe) and the folder in which the file

-should be contained.

-<br>&nbsp;

-<h3>

-Details</h3>

-The&nbsp; Multi Page Editor Example demonstrates how to create an multi

-page editor with a custom page contributor.

-<p>The Multi Page Editor Example is constructed with two extensions - a

-document contributor (MultiPageContributor) and an editor (MultiPageEditor).

-The document contributor is a subclass of <tt>org.eclipse.ui.part.MultiPageEditorActionBarContributor</tt>

-and defines the actions that are added to an editor when the <tt>setActivePage</tt>

-method is called. The editor is an <tt>org.eclipse.ui.part.MultiPageEditorPart</tt>

-that creates 3 pages whose activation is handled by the <tt>pageChange</tt>

-method that in turn sends <tt>setActivePage</tt>

-to the contributor. These two classes do not refer to each other directly

-- the contributor for the editor is set using the contributorClass tag

-in the plugin.xml

-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/icons/basic/copy.gif b/examples/org.eclipse.ui.examples.multipageeditor/icons/basic/copy.gif
deleted file mode 100644
index f962255..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/icons/basic/copy.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/icons/copy.gif b/examples/org.eclipse.ui.examples.multipageeditor/icons/copy.gif
deleted file mode 100644
index f962255..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/icons/copy.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/icons/full/copy.gif b/examples/org.eclipse.ui.examples.multipageeditor/icons/full/copy.gif
deleted file mode 100644
index 4274b07..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/icons/full/copy.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.multipageeditor/plugin.properties b/examples/org.eclipse.ui.examples.multipageeditor/plugin.properties
deleted file mode 100644
index 2c9eff3..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Plugin.name = MultiPage Editor Example

-Editors.MultiPageEditorExample = Multi-Page Editor Example

diff --git a/examples/org.eclipse.ui.examples.multipageeditor/plugin.xml b/examples/org.eclipse.ui.examples.multipageeditor/plugin.xml
deleted file mode 100644
index 815103f..0000000
--- a/examples/org.eclipse.ui.examples.multipageeditor/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!-- ======================================================================= -->

-<!-- The MultiPage Editor Example is a sample plugin which demonstrates the  -->

-<!-- implementation of a multi-page editor.                                  -->

-<!-- ======================================================================= -->

-<plugin

-   name = "%Plugin.name"

-   id = "org.eclipse.ui.examples.multipageeditor"

-   version = "1.0"

-   provider-name = "Object Technology International, Inc.">

-

-   <requires>

-      <import plugin="org.eclipse.ui"/>

-      <import plugin="org.eclipse.core.resources"/>

-   </requires>

-

-   <runtime>

-     <library name="multipageeditor.jar">

-     	<export name="*"/>

-     </library>

-   </runtime>

-

-   <extension

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

-	<editor

-		id = "org.eclipse.ui.examples.multipageeditor.MultiPageEditorExample"

-		name="%Editors.MultiPageEditorExample"

-		icon="icons/copy.gif"     	  

-		extensions="mpe"

-		class="org.eclipse.ui.examples.multipageeditor.MultiPageEditorExample"

-		contributorClass="org.eclipse.ui.examples.multipageeditor.MultiPageContributor" >                              

-	</editor>

-   </extension>

-</plugin>

diff --git a/examples/org.eclipse.ui.examples.propertysheet/.classpath b/examples/org.eclipse.ui.examples.propertysheet/.classpath
deleted file mode 100644
index d3ca53d..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="Eclipse UI Examples PropertySheet"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtime.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtimesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resources.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resourcessrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt/swt.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.swt/swtsrc.zip"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/examples/org.eclipse.ui.examples.propertysheet/.cvsignore b/examples/org.eclipse.ui.examples.propertysheet/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.propertysheet/.vcm_meta b/examples/org.eclipse.ui.examples.propertysheet/.vcm_meta
deleted file mode 100644
index 9615b07..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/.vcm_meta
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<comment></comment>

-	<nature id="org.eclipse.jdt.core.javanature"/>

-	<reference project-name="org.eclipse.ui"/>

-	<builder name="org.eclipse.jdt.core.javabuilder">

-	</builder>

-</project-description>

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Address.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Address.java
deleted file mode 100644
index 47b2df0..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Address.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.util.Vector;

-

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

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

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

-

-/**

- * Example IPropertySource who itself is NOT editable, but whose children are.

- * The values of the children determine the value of the address.

- */

-public class Address implements IPropertySource {

-

-	//properties

-	private String city;

-	private Integer province;

-	private String postalCode;

-	private StreetAddress street;

-

-	//Property unique keys

-	public static final String P_ID_STREET = "Address.Street"; //$NON-NLS-1$

-	public static final String P_ID_CITY = "Address.City"; //$NON-NLS-1$

-	public static final String P_ID_PROVINCE = "Address.Province"; //$NON-NLS-1$

-	public static final String P_ID_POSTALCODE = "Address.PostalCode"; //$NON-NLS-1$

-

-	//Property display keys

-	public static final String P_STREET = MessageUtil.getString("Street"); //$NON-NLS-1$

-	public static final String P_CITY = MessageUtil.getString("City"); //$NON-NLS-1$

-	public static final String P_PROVINCE = MessageUtil.getString("Province"); //$NON-NLS-1$

-	public static final String P_POSTALCODE = MessageUtil.getString("PostalCode"); //$NON-NLS-1$

-	public static final String P_DESCRIPTORS = "properties"; //$NON-NLS-1$

-

-

-	//default values	

-	private static final StreetAddress STREET_DEFAULT = new StreetAddress();

-	private static final String CITY_DEFAULT = MessageUtil.getString("unspecified_city"); //$NON-NLS-1$

-	private static final Integer PROVINCE_DEFAULT = new Integer(0);

-	private static final String POSTALCODE_DEFAULT = "A1B2C3"; //$NON-NLS-1$

-

-	//

-	static private class ProvinceLabelProvider extends LabelProvider {

-		public String getText(Object element) {

-			String[] provinceValues = new String[] {MessageUtil.getString("British_Columbia"), MessageUtil.getString("Alberta"), MessageUtil.getString("Saskatchewan"), MessageUtil.getString("Manitoba"), MessageUtil.getString("Ontario"), MessageUtil.getString("Quebec"), MessageUtil.getString("Newfoundland"), MessageUtil.getString("Prince_Edward_Island"), MessageUtil.getString("Nova_Scotia"), MessageUtil.getString("New_Brunswick"), MessageUtil.getString("Yukon"), MessageUtil.getString("North_West_Territories"), MessageUtil.getString("Nunavut")}; //$NON-NLS-13$ //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-7$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$

-			return provinceValues[((Integer)element).intValue()];

-		}

-	}

-

-	//

-	private static Vector descriptors;

-	private static String[] provinceValues;

-	static {

-		descriptors = new Vector();

-		provinceValues = new String[] {MessageUtil.getString("British_Columbia"), MessageUtil.getString("Alberta"), MessageUtil.getString("Saskatchewan"), MessageUtil.getString("Manitoba"), MessageUtil.getString("Ontario"), MessageUtil.getString("Quebec"), MessageUtil.getString("Newfoundland"), MessageUtil.getString("Prince_Edward_Island"), MessageUtil.getString("Nova_Scotia"), MessageUtil.getString("New_Brunswick"), MessageUtil.getString("Yukon"), MessageUtil.getString("North_West_Territories"), MessageUtil.getString("Nunavut")}; //$NON-NLS-13$ //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-7$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$

-		descriptors.addElement(new PropertyDescriptor(P_ID_STREET, P_STREET));

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_CITY, P_CITY));

-

-

-		//PostalCode

-		PropertyDescriptor propertyDescriptor = new TextPropertyDescriptor(P_ID_POSTALCODE, P_POSTALCODE);

-		//add custom validator to propertyDescriptor limiting postalcode

-		//values to XYXYXY, where X is a letter and Y is a digit

-		propertyDescriptor.setValidator(new ICellEditorValidator() {

-			public String isValid(Object value) {

-				if (value == null)

-					return MessageUtil.getString("postal_code_is_incomplete"); //$NON-NLS-1$

-

-				//

-				String testPostalCode = ((String) value).toUpperCase();

-				final int length = testPostalCode.length();

-				final char space = ' ';

-

-				//removes white space

-				StringBuffer postalCodeBuffer = new StringBuffer(6);

-				char current;

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

-					current = testPostalCode.charAt(i);

-					if (current != space)

-						postalCodeBuffer.append(current);

-				}

-				testPostalCode = postalCodeBuffer.toString();

-

-				//check for proper length

-				if (testPostalCode.length() != 6) {

-					//fail	

-					return MessageUtil.format("_is_an_invalid_format_for_a_postal_code", new Object[] {testPostalCode}); //$NON-NLS-1$

-				}

-

-				//check for proper format

-				if (

-					testPostalCode.charAt(1) < '0' || testPostalCode.charAt(1) > '9' || 

-					testPostalCode.charAt(3) < '0' || testPostalCode.charAt(3) > '9' ||

-					testPostalCode.charAt(5) < '0' || testPostalCode.charAt(5) > '9' || 

-					testPostalCode.charAt(0) < 'A' || testPostalCode.charAt(0) > 'Z' ||

-					testPostalCode.charAt(2) < 'A' || testPostalCode.charAt(2) > 'Z' ||

-					testPostalCode.charAt(4) < 'A' || testPostalCode.charAt(4) > 'Z'

-				) {

-					//fail

-					return MessageUtil.format("_is_an_invalid_format_for_a_postal_code", new Object[] {testPostalCode}); //$NON-NLS-1$

-				}

-

-				//all pass

-				return null;

-			}

-		});

-		descriptors.addElement(propertyDescriptor);

-

-		//

-		ComboBoxPropertyDescriptor desc = new ComboBoxPropertyDescriptor(P_ID_PROVINCE, P_PROVINCE, provinceValues);

-		desc.setLabelProvider(new ProvinceLabelProvider());

-		descriptors.addElement(desc);

-	}

-/**

- * Address Default Constructor

- */

-Address() {

-	super();

-}

-/**

- * Creates a new address.

- *

- * @param street the street 

- * @param city the city

- * @param province the province

- * @param postalCode has the form XYXYXY: where X is a letter and Y is a digit

- * @exception IllegalArgumentException, if postalcode not in above form

- */

-public Address(StreetAddress street, String city, Integer province, String postalCode) {

-	super();

-	setStreet(street);

-	setCity(city);

-	setPostalCode(postalCode);

-	setProvince(province);

-}

-/**

- * Returns the city

- */

-private String getCity() {

-	if(city == null)

-		city = CITY_DEFAULT;

-	return city;

-}

-/* 

- * Standard Accessor

- */

-private static Vector getDescriptors() {

-	return descriptors;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this.toString();

-}

-/**

- * Returns the postal code

- */

-private String getPostalCode() {

-	if(postalCode == null)

-		postalCode = POSTALCODE_DEFAULT;

-	return postalCode;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	return (IPropertyDescriptor[])getDescriptors().toArray(new IPropertyDescriptor[getDescriptors().size()]);

-}

-/** 

- * The <code>Address</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- *

- * 	1) P_CITY returns java.lang.String

- * 	2) P_POSTALCODE returns java.lang.String

- *  3) P_PROVINCE returns java.lang.String

- *	4) P_STREET returns StreetAddress

- */

-public Object getPropertyValue(Object propKey) {

-	if (propKey.equals(P_ID_PROVINCE))

-		return getProvince();

-	if (propKey.equals(P_ID_STREET))

-		return getStreet();

-	if (propKey.equals(P_ID_CITY))

-		return getCity();

-	if (propKey.equals(P_ID_POSTALCODE))

-		return getPostalCode();

-	return null;

-}

-/**

- * Returns the province

- */

-private Integer getProvince() {

-	if(province == null)

-		province = PROVINCE_DEFAULT;

-	return province;

-}

-/**

- * Returns the street

- */

-public StreetAddress getStreet() {

-	if(street == null)

-		street = STREET_DEFAULT;

-	return street;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object property) {

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void resetPropertyValue(Object property) {

-	if (P_ID_POSTALCODE.equals(property)) {

-		setPostalCode(POSTALCODE_DEFAULT);

-		return;

-	}

-	if (P_ID_CITY.equals(property)) {

-		setCity(CITY_DEFAULT);

-		return;

-	}

-	if (P_ID_PROVINCE.equals(property)) {

-		setProvince(PROVINCE_DEFAULT);

-		return;

-	};

-	if (P_ID_STREET.equals(property)) {

-		setStreet(STREET_DEFAULT);

-		return;

-	}

-}

-/**

- * Sets the city

- */

-private void setCity(String newCity) {

-	city = newCity;

-}

-/**

- * Sets the postal code

- */

-private void setPostalCode(String newPostalCode) {

-	//validation in ICellEditorValidator registered in PropertyDescriptor

-	this.postalCode = newPostalCode.toUpperCase();		

-}

-/** 

- * The <code>Address</code> implementation of this

- * <code>IPropertySource</code> method 

- * defines the following Setable properties

- *

- * 	1) P_CITY expects java.lang.String

- * 	2) P_POSTALCODE expects java.lang.String

- *  3) P_PROVINCE expects java.lang.String

- *	4) P_STREET expects StreetAddress

- */

-public void setPropertyValue(Object name, Object value) {

-	if (P_ID_POSTALCODE.equals(name)) {

-		setPostalCode((String) value);

-		return;

-	}

-	if (P_ID_CITY.equals(name)) {

-		setCity((String) value);

-		return;

-	}

-	if (P_ID_PROVINCE.equals(name)) {

-		setProvince((Integer) value);

-		return;

-	}

-	if (P_ID_STREET.equals(name)) {

-		//setStreet((StreetAddress) value);

-		return;

-	} 

-

-}

-/**

- * Sets the province

- */

-private void setProvince(Integer newProvince) {

-	province = newProvince;

-}

-/**

- * Sets the street

- */

-private void setStreet(StreetAddress newStreet) {

-	street = newStreet;

-}

-/**

- * The value as displayed in the Property Sheet. Will not print default values

- * @return java.lang.String

- */

-public String toString() {

-	StringBuffer outStringBuffer = new StringBuffer();

-	final String comma_space = ", "; //$NON-NLS-1$

-	final String space = " "; //$NON-NLS-1$

-	if (!getStreet().equals(STREET_DEFAULT)) {

-		outStringBuffer.append(getStreet());

-		outStringBuffer.append(comma_space);

-	}

-	if (!getCity().equals(CITY_DEFAULT)) {

-		outStringBuffer.append(getCity());

-		outStringBuffer.append(space);

-	}

-	if (!getProvince().equals(PROVINCE_DEFAULT)) {

-		outStringBuffer.append(provinceValues[getProvince().intValue()]);

-	}

-	if (!getPostalCode().equals(POSTALCODE_DEFAULT)) {

-		outStringBuffer.append(comma_space);

-		outStringBuffer.append(getPostalCode());

-	}

-	return outStringBuffer.toString();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Birthday.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Birthday.java
deleted file mode 100644
index 374fb3e..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Birthday.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.text.DateFormat;

-import java.text.SimpleDateFormat;

-import java.util.*;

-

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

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

-

-/**

- * Example IPropertySource who itself is NOT editable, but whose children are.

- * The values of the children determine the value of the birthday.

- */

-public class Birthday implements IPropertySource {

-

-	//Properties

-	private Integer day, month, year;

-

-	//Property unique keys

-	public static final String P_ID_DAY = "Birthday.day"; //$NON-NLS-1$

-	public static final String P_ID_MONTH = "Birthday.month"; //$NON-NLS-1$

-	public static final String P_ID_YEAR = "Birthday.year"; //$NON-NLS-1$

-	

-	//Property display keys

-	public static final String P_DAY = MessageUtil.getString("day"); //$NON-NLS-1$

-	public static final String P_MONTH = MessageUtil.getString("month"); //$NON-NLS-1$

-	public static final String P_YEAR = MessageUtil.getString("year"); //$NON-NLS-1$

-

-	//default values	

-	private static final Integer DAY_DEFAULT = new Integer(1);

-	private static final Integer MONTH_DEFAULT = new Integer(1);

-	private static final Integer YEAR_DEFAULT = new Integer(2000);

-

-	//static date formater

-	private static final DateFormat formatter  = new SimpleDateFormat("EEEE, MMMM d, yyyy"); //$NON-NLS-1$

-

-	static private class DayLabelProvider extends LabelProvider {

-		public String getText(Object element) {

-			String[] dayValues = new String[] {"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"}; //$NON-NLS-31$ //$NON-NLS-30$ //$NON-NLS-29$ //$NON-NLS-28$ //$NON-NLS-27$ //$NON-NLS-26$ //$NON-NLS-25$ //$NON-NLS-24$ //$NON-NLS-23$ //$NON-NLS-22$ //$NON-NLS-21$ //$NON-NLS-20$ //$NON-NLS-19$ //$NON-NLS-18$ //$NON-NLS-17$ //$NON-NLS-16$ //$NON-NLS-15$ //$NON-NLS-14$ //$NON-NLS-13$ //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-7$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$

-			return dayValues[((Integer)element).intValue()];

-		}

-	}

-	

-	static private class MonthLabelProvider extends LabelProvider {

-		public String getText(Object element) {

-			String[] monthValues = new String[] {MessageUtil.getString("January"), MessageUtil.getString("February"), MessageUtil.getString("March"), MessageUtil.getString("April"), MessageUtil.getString("May"), MessageUtil.getString("June"), MessageUtil.getString("July"), MessageUtil.getString("August"), MessageUtil.getString("September"), MessageUtil.getString("October"), MessageUtil.getString("November"), MessageUtil.getString("December")}; //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-7$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$

-			return monthValues[((Integer)element).intValue()];

-		}

-	}

-

-	//

-	private static Vector descriptors;

-	static {

-		descriptors = new Vector();

-

-		///

-		String[] dayValues = new String[] {"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"}; //$NON-NLS-31$ //$NON-NLS-30$ //$NON-NLS-29$ //$NON-NLS-28$ //$NON-NLS-27$ //$NON-NLS-26$ //$NON-NLS-25$ //$NON-NLS-24$ //$NON-NLS-23$ //$NON-NLS-22$ //$NON-NLS-21$ //$NON-NLS-20$ //$NON-NLS-19$ //$NON-NLS-18$ //$NON-NLS-17$ //$NON-NLS-16$ //$NON-NLS-15$ //$NON-NLS-14$ //$NON-NLS-13$ //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-7$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$

-		ComboBoxPropertyDescriptor days = new ComboBoxPropertyDescriptor(P_ID_DAY, P_DAY, dayValues);

-		days.setLabelProvider(new DayLabelProvider());

-		descriptors.addElement(days);

-

-		///

-		String[] monthValues = new String[] {MessageUtil.getString("January"), MessageUtil.getString("February"), MessageUtil.getString("March"), MessageUtil.getString("April"), MessageUtil.getString("May"), MessageUtil.getString("June"), MessageUtil.getString("July"), MessageUtil.getString("August"), MessageUtil.getString("September"), MessageUtil.getString("October"), MessageUtil.getString("November"), MessageUtil.getString("December")}; //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-7$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$

-		ComboBoxPropertyDescriptor months = new ComboBoxPropertyDescriptor(P_ID_MONTH, P_MONTH, monthValues);

-		months.setLabelProvider(new MonthLabelProvider());

-		descriptors.addElement(months);

-

-		///

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_YEAR, P_YEAR));

-	}

-/**

- * Address Default Constructor

- */

-Birthday() {

-	super();

-}

-/**

- * Convenience Address Constructor

- */

-public Birthday(int day, int month, int year) {

-	super();

-	setDay(new Integer(day));

-	setMonth(new Integer(month)); 

-	setYear(new Integer(year));

-}

-/**

- * Returns the day

- */

-private Integer getDay() {

-	if(day == null)

-		day = DAY_DEFAULT;

-	return day;

-}

-/**

- * Standard Accessor

- */

-private static Vector getDescriptors() {

-	return descriptors;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this.toString();

-}

-/**

- * Returns the month

- */

-private Integer getMonth() {

-	if(month == null)

-		month = MONTH_DEFAULT;

-	return month;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	return (IPropertyDescriptor[])getDescriptors().toArray(new IPropertyDescriptor[getDescriptors().size()]);

-}

-/** 

- * The <code>Birthday</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- *

- * 	1) P_DAY returns java.lang.Integer

- * 	2) P_MONTH returns java.lang.Integer

- *  3) P_YEAR returns java.lang.Integer

- *	4) P_STREET returns java.lang.String

- */

-public Object getPropertyValue(Object propKey) {

-	if (propKey.equals(P_ID_DAY))

-		return new Integer(getDay().intValue() - 1);

-	if (propKey.equals(P_ID_MONTH))

-		return new Integer(getMonth().intValue() - 1);

-	if (propKey.equals(P_ID_YEAR))

-		return getYear().toString();

-	return null;

-}

-/**

- * Returns the year

- */

-private Integer getYear() {

-	if(year == null)

-		year = YEAR_DEFAULT;

-	return year;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object property) {

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void resetPropertyValue(Object property) {

-	if (P_ID_DAY.equals(property)) {

-		setDay(DAY_DEFAULT);

-		return;

-	}

-	if (P_ID_MONTH.equals(property)) {

-		setMonth(MONTH_DEFAULT);

-		return;

-	}

-	if (P_ID_YEAR.equals(property)) {

-		setYear(YEAR_DEFAULT);

-		return;

-	};

-}

-/**

- * Sets the day

- */

-private void setDay(Integer newDay) {

-	day = newDay;

-}

-/**

- * Sets the month

- */

-private void setMonth(Integer newMonth) {

-	month = newMonth;

-}

-/** 

- * The <code>Birthday</code> implementation of this

- * <code>IPropertySource</code> method 

- * defines the following Setable properties

- *

- * 	1) P_DAY expects java.lang.Integer

- * 	2) P_MONTH expects java.lang.Integer

- *  3) P_YEAR expects java.lang.Integer

- */

-public void setPropertyValue(Object name, Object value) {

-	if (P_ID_DAY.equals(name)) {

-		setDay(new Integer(((Integer)value).intValue() + 1));

-		return;

-	}

-	if (P_ID_MONTH.equals(name)) {

-		setMonth(new Integer(((Integer)value).intValue() + 1));

-		return;

-	}

-	if (P_ID_YEAR.equals(name)) {

-		try {

-			setYear(new Integer((String)value));

-		} catch (NumberFormatException e) {

-			setYear(YEAR_DEFAULT);

-		}

-		return;

-	}

-}

-/**

- * Sets the year

- */

-private void setYear(Integer newYear) {

-	year = newYear;

-}

-/**

- * The value as displayed in the Property Sheet. Will not print default values

- * @return java.lang.String

- */

-public String toString() {

-	Date bday =(new GregorianCalendar(getYear().intValue(), getMonth().intValue() - 1, getDay().intValue())).getTime();

-	return formatter.format(bday);

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddress.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddress.java
deleted file mode 100644
index b35d652..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddress.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.util.Vector;

-

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

-

-/**

- * Example IPropertySource is editable and whose childern properties are itself not editable.

- * The values of "userid" and "mailserver" are parsed from seting "email"

- */

-public class EmailAddress implements IPropertySource {

-

-	//Property-Value

-	private String userid;

-	private String domain;

-

-	//Default Property-Value

-	private static final String USERID_DEFAULT = MessageUtil.getString("unknownUser"); //$NON-NLS-1$

-	private static final String DOMAIN_DEFAULT = MessageUtil.getString("unknownDomain"); //$NON-NLS-1$

-	

-	//Property unique keys

-	public static final String P_ID_USERID = "EmailAddress.userid"; //$NON-NLS-1$

-	public static final String P_ID_DOMAIN = "EmailAddress.domain"; //$NON-NLS-1$

-	

-	//Property display keys

-	public static final String P_USERID = MessageUtil.getString("userid"); //$NON-NLS-1$

-	public static final String P_DOMAIN = MessageUtil.getString("domain"); //$NON-NLS-1$

-

-	//Property-Descriptors

-	private static Vector descriptors;

-

-	static{

-		descriptors = new Vector(2,2);

-		//non-editable child properties --> provide no editors

-		descriptors.addElement(new PropertyDescriptor(P_ID_USERID, P_USERID));

-		descriptors.addElement(new PropertyDescriptor(P_ID_DOMAIN, P_DOMAIN));	

-	}

-/**

- * EmailAddress Default Constructor

- */

-public EmailAddress() {

-	super();

-}

-/**

- * Convience EmailAddress constructor.

- * Calls setEmailAddress() to parse emailAddress

- * @param emailAddress java.lang.String, in the form userid@domain

- * @throws java.lang.IllegalArgumentException, if does not subscribe to form

- */

-public EmailAddress(String emailAddress) throws IllegalArgumentException{

-	super();

-	setEmailAddress(emailAddress);

-

-}

-/**

- * Returns the descriptors

- */

-private static Vector getDescriptors() {

-	return descriptors;

-}

-/**

- * Returns the domain

- */

-private String getDomain() {

-	if(domain == null)

-		domain = DOMAIN_DEFAULT;

-	return domain;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this.toString();

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	return (IPropertyDescriptor[])getDescriptors().toArray(new IPropertyDescriptor[getDescriptors().size()]);

-}

-/** 

- * The <code>EmailAddress</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- *

- * 	1) P_USERID returns String, values before "@"

- *	2) P_DOMAIN returns String, values after "@"

- *

- * Observe the available properties must always equal those listed

- * in the property descriptors

- */

-public Object getPropertyValue(Object propKey) {

-	if (propKey.equals(P_ID_USERID))

-		return getUserid();

-	if (propKey.equals(P_ID_DOMAIN))

-		return getDomain();

-	return null;

-}

-/**

- * Returns the userid

- */

-private String getUserid() {

-	if(userid == null)

-		userid = USERID_DEFAULT;

-	return userid;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object property) {

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void resetPropertyValue(Object property) {

-	if (property.equals(P_ID_USERID)) {

-		setUserid(USERID_DEFAULT);

-		return;

-	}

-	if (property.equals(P_ID_DOMAIN)) {

-		setDomain(DOMAIN_DEFAULT);

-		return;

-	}

-	return;

-}

-/**

- * Sets the domain

- */

-private void setDomain(java.lang.String newDomain) {

-	domain = newDomain;

-}

-/**

- * Parses emailAddress into domain and userid. Throws SetPropertyVetoException

- * if emailAddress does not contain an userid and domain seperated by '@'.

- *

- * @param emailAddress the email address

- * @throws IllegalArgumentException

- */

-private void setEmailAddress(String emailAddress) throws IllegalArgumentException {

-	if(emailAddress == null)

-		throw new IllegalArgumentException(MessageUtil.getString("emailaddress_cannot_be_set_to_null")); //$NON-NLS-1$

-	int index = emailAddress.indexOf('@');

-	int length = emailAddress.length();

-	if (index > 0 && index < length) {

-		setUserid(emailAddress.substring(0, index));

-		setDomain(emailAddress.substring(index + 1));

-		return;

-	}

-	throw new IllegalArgumentException(MessageUtil.getString("invalid_email_address_format_should_have_been_validated")); //$NON-NLS-1$

-}

-/** 

- * The <code>Address</code> implementation of this

- * <code>IPropertySource</code> method 

- * defines the following Setable properties

- *

- *	1) P_USERID, expects String

- *	2) P_DOMAIN, expects String

- */

-public void setPropertyValue(Object name, Object value) {

-	if (name.equals(P_ID_USERID)) {

-		setUserid((String) value);

-		return;

-	}

-	if (name.equals(P_ID_DOMAIN)) {

-		setDomain((String) value);

-		return;

-	}

-}

-/**

- * Sets the userid

- */

-private void setUserid(String newUserid) {

-	userid = newUserid;

-}

-/**

- * The value as displayed in the Property Sheet. Will not print default values

- * @return java.lang.String

- */

-public String toString() {

-	StringBuffer strbuffer = new StringBuffer(getUserid());

-	strbuffer.append('@');

-	strbuffer.append(getDomain());

-	return strbuffer.toString();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddressValidator.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddressValidator.java
deleted file mode 100644
index f91d8c6..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/EmailAddressValidator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

-/**

- * Validator for email addresses

- */

-public class EmailAddressValidator implements ICellEditorValidator {

-/** 

- * The <code>EmailAddressValidator</code> implementation of this

- * <code>ICellEditorValidator</code> method 

- * determines if the value is a valid email address.

- * (check to see if it is non-null and contains an @)

- */

-public String isValid(Object value) {

-	if (value == null) {

-		return MessageUtil.getString("email_address_is_incomplete"); //$NON-NLS-1$

-	}

-	String emailAddress = (String)value;

-	int index = emailAddress.indexOf('@');

-	int length = emailAddress.length();

-	if (index > 0 && index < length) {

-		return null;

-	}

-	return MessageUtil.getString("email_address_does_not_have_a_valid_format"); //$NON-NLS-1$

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/GroupElement.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/GroupElement.java
deleted file mode 100644
index 4ac0544..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/GroupElement.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.util.Vector;

-

-/**

- * A Group Element

- */

-public class GroupElement extends OrganizationElement {

-	public static String P_USERS = "users"; //$NON-NLS-1$

-	public static String P_SUBGROUPS = "subgroups"; //$NON-NLS-1$

-	public static String P_CONTENTS = "contents"; //$NON-NLS-1$

-	private Vector subGroups;

-	private Vector users;

-	// must be synchronized to contain both the references of subGroups and users

-	private Vector contents;

-/**

- * Constructor.

- * Creates a new GroupElement within the passed parent GroupElement,

- * gives it the passed name property, sets Icon.

- *

- * @param name the name 

- * @param parent the parent

- */

-public GroupElement(String name, GroupElement parent) {

-	super(name, parent);

-}

-/**

- * Adds an OrganizationElement to this GroupElement.

- *

- * @param userGroup The Organization Element

- */

-public void add(OrganizationElement userGroup) {

-	if (userGroup.isUser() || userGroup.isGroup()) {

-		getContents().add(userGroup);		

-	}

-	if (userGroup.isGroup()) {

-		getSubGroups().add(userGroup);

-		// synchronizes backpointer of userGroup: defensive

-		userGroup.setParent(this);

-	}

-	if (userGroup.isUser()) {

-		getUsers().add(userGroup);

-		// synchronizes backpointer of userGroup: defensive

-		userGroup.setParent(this);

-	}

-

-}

-/**

- * Creates a new <code>GroupElement</code>

- * nested in this <code>GroupElement<code>

- *

- * @param name the name of the sub group

- */

-public GroupElement createSubGroup(String name) {

-	GroupElement newGroup = new GroupElement(name, this);

-	add(newGroup);

-	return newGroup;

-}

-/**

- * Creates a new <code>UserElement</code>

- *

- * @param the name of the user element

- */

-public UserElement createUser(String name) {

-	UserElement newUser = new UserElement(name, this);

-	add(newUser);

-	return newUser;

-}

-/**

- * Deletes an OrganizationElement from this GroupElement.

- *

- * @param userGroup the Organization Element

- */

-public void delete(OrganizationElement userGroup) {

-	if (userGroup.isUser() || userGroup.isGroup()) {

-		getContents().remove(userGroup);

-	}

-	if (userGroup.isGroup()) {

-		getSubGroups().remove(userGroup);

-		// synchronizes backpointer of userGroup: defensive

-	}

-	if (userGroup.isUser()) {

-		getUsers().remove(userGroup);

-		// synchronizes backpointer of userGroup: defensive

-	}

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public Object[] getChildren(Object o) {

-	return getContents().toArray();

-}

-/**

- * Returns the content

- */

-private Vector getContents() {

-	if (contents == null)

-		contents = new Vector();

-	return contents;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this.toString();

-}

-/**

- * Returns the error message

- */

-public String getErrorMessage() {

-	return null;

-}

-/**

- * Returns the subgroups

- */

-private Vector getSubGroups() {

-	if (subGroups == null)

-		subGroups = new Vector();

-	return subGroups;

-}

-/**

- * Returns the users

- */

-private Vector getUsers() {

-	if (users == null)

-		users = new Vector();

-	return users;

-}

-/* (non-Javadoc)

- * Method declared on OrganizationElement

- */

-public boolean isGroup() {

-	return true;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/IUserConstants.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/IUserConstants.java
deleted file mode 100644
index 6484841..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/IUserConstants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-/**

- * This interface contains constants for use only within the

- * property sheet example.

- */

-public interface IUserConstants {

-	public static final String PLUGIN_ID = "org.eclipse.ui.examples.propertysheet"; //$NON-NLS-1$

-	public static final String PREFIX = PLUGIN_ID + "."; //$NON-NLS-1$

-	public static final String P_CONTENT_OUTLINE = PREFIX + "content_outline"; //$NON-NLS-1$

-	public static final String EXTENSION = "usr"; //$NON-NLS-1$

-	public static final String ATT_CLASS = "class"; //$NON-NLS-1$

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/MessageUtil.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/MessageUtil.java
deleted file mode 100644
index 034b0ce..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/MessageUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.ui.examples.propertysheet;

-

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-/**

- * Utility class which helps with managing messages.

- */

-/* package */ class MessageUtil {

-

-	private static final String RESOURCE_BUNDLE= "org.eclipse.ui.examples.propertysheet.messages";//$NON-NLS-1$

-

-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-	private MessageUtil() {

-	}

-

-	/**

-	 * Returns the formatted message for the given key in

-	 * the resource bundle. 

-	 *

-	 * @param key the resource name

-	 * @param args the message arguments

-	 * @return the string

-	 */	

-	public static String format(String key, Object[] args) {

-		return MessageFormat.format(getString(key),args);

-	}

-

-	/**

-	 * Returns the resource object with the given key in

-	 * the resource bundle. If there isn't any value under

-	 * the given key, the key is returned, surrounded by '!'s.

-	 *

-	 * @param key the resource name

-	 * @return the string

-	 */	

-	public static String getString(String key) {

-		try {

-			return fgResourceBundle.getString(key);

-		} catch (MissingResourceException e) {

-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$

-		}

-	}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Name.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Name.java
deleted file mode 100644
index 46ce9d4..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/Name.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.util.Vector;

-

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

-

-/**

- * Example IPropertySource whose value as well as its children are editable.

- */

-public class Name implements IPropertySource

-{

-	private String firstName = ""; //$NON-NLS-1$

-	private String lastName = ""; //$NON-NLS-1$

-	private String initial = ""; //$NON-NLS-1$

-	

-	// property unique keys

-	public static String P_ID_FIRSTNAME = "Name.FirstName"; //$NON-NLS-1$

-	public static String P_ID_LASTNAME = "Name.LastName"; //$NON-NLS-1$

-	public static String P_ID_MIDDLENAME = "Name.Middle"; //$NON-NLS-1$

-

-	// property display keys

-	public static String P_FIRSTNAME = MessageUtil.getString("FirstName"); //$NON-NLS-1$

-	public static String P_LASTNAME = MessageUtil.getString("LastName"); //$NON-NLS-1$

-	public static String P_MIDDLENAME = MessageUtil.getString("Middle"); //$NON-NLS-1$

-	

-	public static final String P_DESCRIPTORS = "properties"; //$NON-NLS-1$

-	static private Vector descriptors;	

-	static

-	{

-		descriptors = new Vector();

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_FIRSTNAME, P_FIRSTNAME));

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_LASTNAME, P_LASTNAME));

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_MIDDLENAME, P_MIDDLENAME));

-	}

-/**

- * Creates a new Name.

- * @param name String in the form "firstname initial lastname"

- */

-public Name(String name) {

-	int index1, index2, length;

-	index1 = name.indexOf(' ');

-	if (index1 < 0)

-		index1 = name.length();

-	index2 = name.lastIndexOf(' ');

-	length = name.length();

-	if (index2 > 0)

-		lastName = name.substring(index2 + 1);

-	firstName = name.substring(0, index1);

-	if (index1 < index2)

-		initial = name.substring(index1 + 1, index2);

-}

-/**

- * Returns the descriptors

- */

-private static Vector getDescriptors() {

-	return descriptors;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this.toString();

-}

-/**

- * Returns the first name

- */

-private String getFirstName()

-{	

-	return firstName;

-}

-/**

- * Returns the initial

- */

-private String getInitial()

-{	

-	return initial;

-}

-/**

- * Returns the last name

- */

-private String getLastName()

-{	

-	return lastName;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	return (IPropertyDescriptor[])getDescriptors().toArray(new IPropertyDescriptor[getDescriptors().size()]);

-}

-/** 

- * The <code>Name</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- *

- * 	1) P_FIRSTNAME returns String, firstname

- * 	2) P_LASTNAME returns String, lastname

- *  3) P_MIDDLENAME returns String, middle

- */

-public Object getPropertyValue(Object propKey) {

-	if (P_ID_FIRSTNAME.equals(propKey))

-		return getFirstName();

-	if (P_ID_LASTNAME.equals(propKey))

-		return getLastName();

-	if (P_ID_MIDDLENAME.equals(propKey))

-		return getInitial();

-	return null;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object key) {

-	return false;

-}

-/**

- * Implemented as part of IPropertySource framework. Sets the specified property 

- * to its default value.

- * 

- * @see 	IPropertySource#resetPropertyValue(Object)

- * @param 	property 	The property to reset.

- */

-public void resetPropertyValue(Object property) {

-	if (P_ID_FIRSTNAME.equals(property)) {

-		setFirstName(null);

-		return;

-	}

-	if (P_ID_LASTNAME.equals(property)) {

-		setLastName(null);

-		return;

-	}

-	if (P_ID_MIDDLENAME.equals(property)) {

-		setInitial(null);

-		return;

-	}

-}

-/**

- * Sets the first name

- */

-private void setFirstName(String newFirstName)

-{	

-	firstName = newFirstName;

-}

-/**

- * Sets the initial

- */

-private void setInitial(String newInitial)

-{	

-	initial = newInitial;

-}

-/**

- * Sets the last name

- */

-private void setLastName(String newLastName)

-{	

-	lastName = newLastName;

-}

-/** 

- * The <code>Name</code> implementation of this

- * <code>IPropertySource</code> method 

- * defines the following Setable properties

- *

- *	1) P_FIRST, expects String, sets the firstname of this OrganizationElement

- *  2) P_MIDDLENAME, expects String, sets middlename of this OrganizationElement

- *  3) P_LASTNAME, expects String, sets lastname of this OrganizationElement

- */

-public void setPropertyValue(Object propName, Object val) {

-	if (P_ID_FIRSTNAME.equals(propName)) {

-		setFirstName((String) val);

-		return;

-	}

-	if (P_ID_LASTNAME.equals(propName)) {

-		setLastName((String) val);

-		return;

-	}

-	if (P_ID_MIDDLENAME.equals(propName)){

-		setInitial((String) val);

-		return;

-	}

-}

-/**

- * The value as displayed in the Property Sheet. Will not print default values

- * @return java.lang.String

- */

-public String toString(){

-	StringBuffer outStringBuffer = new StringBuffer();

-	if(getFirstName()!=null)

-	{	outStringBuffer.append(getFirstName());

-		outStringBuffer.append(" "); //$NON-NLS-1$

-		if(getInitial()!=null)

-		{	outStringBuffer.append(getInitial());

-			outStringBuffer.append(" "); //$NON-NLS-1$

-		}

-	}

-	if(getLastName()!=null)

-	{	outStringBuffer.append(getLastName());

-	}

-	

-	return outStringBuffer.toString();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/OrganizationElement.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/OrganizationElement.java
deleted file mode 100644
index b0195d1..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/OrganizationElement.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.util.Vector;

-

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

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

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

-import org.eclipse.ui.model.IWorkbenchAdapter;

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

-

-/**

- * An Organization Element

- */

-public abstract class OrganizationElement implements IAdaptable, IPropertySource, IWorkbenchAdapter {

-	//

-	private GroupElement parent;

-	private String name;

-	private ImageDescriptor imageDescriptor;

-	

-	//

-	private static Vector descriptors;

-	static {

-		descriptors = new Vector();

-		PropertyDescriptor name = new TextPropertyDescriptor(IBasicPropertyConstants.P_TEXT, MessageUtil.getString("name")); //$NON-NLS-1$

-		descriptors.addElement(name);

-	}

-/**

- * Constructor.

- * Creates a new OrganizationElement within the passed parent GroupElement,

- *

- * @param name the name 

- * @param parent the parent

- */

-OrganizationElement(String name, GroupElement parent) {

-	this.name = name;

-	this.parent = parent;

-}

-/**

- * Deletes this OrganizationElement from its parentGroup

- */

-public void delete()

-{	parent.delete(this);

-}

-/* (non-Javadoc)

- * Method declared on IAdaptable

- */

-public Object getAdapter(Class adapter) {

-	if (adapter == IPropertySource.class) {

-		return this;

-	}

-	if (adapter == IWorkbenchAdapter.class) {

-		return this;

-	}

-	return null;

-}

-/**

- * Returns the descriptors

- */

-static Vector getDescriptors()

-{	

-	return descriptors;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this;

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public ImageDescriptor getImageDescriptor(Object object) {

-	return imageDescriptor;

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public String getLabel(Object o) {

-	return getName();

-}

-/**

- * Returns the name

- */

-String getName()

-{

-	return name;

-}

-/**

- * Returns the parent

- */

-public Object getParent(Object o)

-{	

-	return parent;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors()

-{	return (IPropertyDescriptor[])getDescriptors().toArray(new IPropertyDescriptor[getDescriptors().size()]);

-}

-/** 

- * The <code>OrganizationElement</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- *

- * 	1) P_NAME returns String, name of this element

- *  this property key is defined in <code>IBasicPropertyConstants</code>

- */

-public Object getPropertyValue(Object propKey)

-{

-	if (propKey.equals(IBasicPropertyConstants.P_TEXT))

-		return getName();

-	return null;

-}

-/**

- * Hook. Implemented by <code>GroupElement</code> for use instead of instanceof

- * @return boolean

- */

-public boolean isGroup() {

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object property) {

-	return false;

-}

-/**

- * Hook. Implemented by <code>UserElement</code> for use instead of instanceof

- * @return boolean

- */

-public boolean isUser() {

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void resetPropertyValue(Object property){}

-/**

- * Sets the image descriptor

- */

-void setImageDescriptor(ImageDescriptor desc) {

-	imageDescriptor = desc;

-}

-/**

- * Sets the name

- */

-void setName(String newName) {

-	name = newName;

-}

-/**

- * Sets this instance's parent back pointer.

- */

-void setParent(GroupElement newParent){

-	parent = newParent;

-}

-/** 

- * The <code>OrganizationElement</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- * defines the following Setable properties

- *

- *	1) P_NAME, expects String, sets the name of this OrganizationElement

- */

-public void setPropertyValue(Object name, Object value) {

-	if (name.equals(IBasicPropertyConstants.P_TEXT)) {

-		setName((String) value);

-		return;

-	}

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PopupMenuActionDelegate.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PopupMenuActionDelegate.java
deleted file mode 100644
index 3c329fc..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PopupMenuActionDelegate.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IWorkbenchPart;

- 

-/**

- * Action delegate for handling popup menu actions.

- */

-public class PopupMenuActionDelegate implements IObjectActionDelegate {

-

-	private IWorkbenchPart part;

-/** (non-Javadoc)

- * Method declared on IDropActionDelegate

- */

-public void run(IAction action) {

-	MessageDialog.openInformation(

-		this.part.getSite().getShell(),

-		MessageUtil.getString("Property_Sheet_Example"), //$NON-NLS-1$

-		MessageUtil.getString("Popup_Menu_Action_executed")); //$NON-NLS-1$

-}

-/** (non-Javadoc)

- * Method declared on IActionDelegate

- */

-public void selectionChanged(IAction action, ISelection selection) {

-	//Ignored for this example

-}

-/** (non-Javadoc)

- * Method declared on IObjectActionDelegate

- */

-public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-	this.part = targetPart;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetContentOutlinePage.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetContentOutlinePage.java
deleted file mode 100644
index ff8dfbc..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetContentOutlinePage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

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

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

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

-import org.eclipse.ui.IWorkbenchActionConstants;

-import org.eclipse.ui.model.WorkbenchContentProvider;

-import org.eclipse.ui.model.WorkbenchLabelProvider;

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

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-

-/**

- * Page for the content outliner

- */

-public class PropertySheetContentOutlinePage extends ContentOutlinePage {

-

-	private IAdaptable model;

-/**

- * Create a new instance of the reciver using adapatable

- * as the model.

- */

-public PropertySheetContentOutlinePage(IAdaptable adaptable) {

-	this.model = adaptable;

-}

-/** 

- * Creates the control and registers the popup menu for this page

- * Menu id "org.eclipse.ui.examples.propertysheet.outline"

- */

-public void createControl(Composite parent) {

-	super.createControl(parent);

-	TreeViewer viewer = getTreeViewer();

-	viewer.setContentProvider(new WorkbenchContentProvider());

-	viewer.setLabelProvider(new WorkbenchLabelProvider());

-	viewer.setInput(this.model); 

-	

-	// Configure the context menu.

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

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

-	menuMgr.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));	 //$NON-NLS-1$

-

-	Menu menu = menuMgr.createContextMenu(viewer.getTree());

-	viewer.getTree().setMenu(menu);

-	// Be sure to register it so that other plug-ins can add actions.

-	getSite().registerContextMenu("org.eclipse.ui.examples.propertysheet.outline", menuMgr, viewer); //$NON-NLS-1$

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetPlugin.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetPlugin.java
deleted file mode 100644
index 4b2c20f..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/PropertySheetPlugin.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-

-/**

- * This is the top-level class of the property sheet example.

- *

- * @see AbstractUIPlugin for additional information on UI plugins

- */

-public class PropertySheetPlugin extends AbstractUIPlugin {

-	// Default instance of the receiver

-	private static PropertySheetPlugin inst;

-/**

- * Create the PropertySheet plugin and cache its default instance

- *

- * @param descriptor  the plugin descriptor which the receiver is made from

- */

-public PropertySheetPlugin(IPluginDescriptor descriptor) {

-	super(descriptor);

-	if (inst==null) inst = this;

-}

-/**

- * Returns the plugin singleton.

- *

- * @return the default PropertySheetPlugin instance

- */

-static public PropertySheetPlugin getDefault() {

-	return inst;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/StreetAddress.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/StreetAddress.java
deleted file mode 100644
index 115812f..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/StreetAddress.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.util.Vector;

-

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

-

-/**

- * PropertySource containing street information pertenant to Address

- */

-public class StreetAddress implements IPropertySource {

-	

-	//properties

-	private Integer buildNo;

-	private String aptBox;

-	private String streetName;

-

-	//default property values

-	private static final Integer BUILD_NO_DEFAULT = new Integer(0);

-	private static final String APTBOX_DEFAULT = MessageUtil.getString("unspecified"); //$NON-NLS-1$

-	private static final String STREETNAME_DEFAULT = MessageUtil.getString("unspecified"); //$NON-NLS-1$

-

-	//property unique keys

-	public static final String P_ID_BUILD_NO = "Street.buildingNo"; //$NON-NLS-1$

-	public static final String P_ID_APTBOX = "Street.aptNo"; //$NON-NLS-1$

-	public static final String P_ID_STREET = "Street.street"; //$NON-NLS-1$

-	

-	//property display keys

-	public static final String P_BUILD_NO = MessageUtil.getString("building_number"); //$NON-NLS-1$

-	public static final String P_APTBOX = MessageUtil.getString("apt.no_or_box.no"); //$NON-NLS-1$

-	public static final String P_STREET = MessageUtil.getString("street"); //$NON-NLS-1$

-

-	//

-	private static Vector descriptors;

-

-	static {

-		descriptors = new Vector();

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_BUILD_NO, P_BUILD_NO));

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_APTBOX, P_APTBOX));

-		descriptors.addElement(new TextPropertyDescriptor(P_ID_STREET, P_STREET));

-	}

-/**

- * Street Default Constructor.

- */

-public StreetAddress() {

-	super();

-}

-/**

- * Convenience Street constructor. AptBox set to default

- */

-public StreetAddress(int buildNo, String streetName) {

-	super();

-	setBuildNo(new Integer(buildNo));

-	setStreetName(streetName);

-}

-/**

- * Convenience Street constructor.

- */

-public StreetAddress(int buildNo, String aptBox, String streetName) {

-	super();

-	setBuildNo(new Integer(buildNo));

-	setAptBox(aptBox);

-	setStreetName(streetName);

-}

-/* (non-Javadoc)

- * Method declared on Object

- */

-public boolean equals(Object ob) {

-	return toString().equals(ob.toString());

-}

-/**

- * the appartment number

- */

-private String getAptBox() {

-	if(aptBox == null)

-		aptBox = APTBOX_DEFAULT;

-	return aptBox;

-}

-/**

- * Returns the building number

- */

-private Integer getBuildNo() {

-	if(buildNo == null)

-		buildNo = BUILD_NO_DEFAULT;

-	return buildNo;

-}

-/**

- * Returns the descriptors

- */

-private static Vector getDescriptors() {

-	return descriptors;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this.toString();

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	return (IPropertyDescriptor[])getDescriptors().toArray(new IPropertyDescriptor[getDescriptors().size()]);

-}

-/** 

- * The <code>Name</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- *

- * 	1) P_BUILD_NO returns java.lang.Integer

- * 	2) P_APTBOX returns java.lang.String

- *	3) P_STREET returns java.lang.String

- */

-public Object getPropertyValue(Object propKey) {

-	if (propKey.equals(P_ID_BUILD_NO))

-		return getBuildNo().toString();

-	if (propKey.equals(P_ID_APTBOX))

-		return getAptBox();

-	if (propKey.equals(P_ID_STREET))

-		return getStreetName();

-	return null;

-}

-/**

- * Returns the street name

- */

-private String getStreetName() {

-	if(streetName == null)

-		streetName = STREETNAME_DEFAULT;

-	return streetName;

-}

-/* (non-Javadoc)

- * Method declared on Object

- */

-public int hashCode()

-{	return toString().hashCode();

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object property) {

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void resetPropertyValue(Object property) {

-	if (property.equals(P_ID_BUILD_NO)) {

-		setBuildNo(BUILD_NO_DEFAULT);

-		return;

-	}

-	if (property.equals(P_ID_APTBOX)) {

-		setAptBox(APTBOX_DEFAULT);

-		return;

-	}

-	if (property.equals(P_ID_STREET)) {

-		setStreetName(STREETNAME_DEFAULT);

-		return;

-	}

-}

-/**

- * Sets the appartment number

- */

-private void setAptBox(String newAptBox) {

-	aptBox = newAptBox;

-}

-/**

- * Sets the building number

- */

-private void setBuildNo(Integer newBuildNo) {

-	buildNo = newBuildNo;

-}

-/** 

- * The <code>Name</code> implementation of this

- * <code>IPropertySource</code> method 

- * defines the following Setable properties

- *

- * 	1) P_BUILD_NO expects java.lang.Integer

- * 	2) P_APTBOX expects java.lang.String

- *	3) P_STREET expects java.lang.String

- */

-public void setPropertyValue(Object name, Object value) {

-	if (name.equals(P_ID_BUILD_NO)) {

-		try {

-			setBuildNo(new Integer(Integer.parseInt((String)value)));

-		} catch (NumberFormatException e) {

-			setBuildNo(BUILD_NO_DEFAULT);

-		}

-		return;

-	}

-	if (name.equals(P_ID_APTBOX)) {

-		setAptBox((String) value);

-		return;

-	}

-	if (name.equals(P_ID_STREET)){

-		setStreetName((String) value);

-		return;

-	}

-}

-/**

- * Sets the street name

- */

-private void setStreetName(String newStreetName) {

-	streetName = newStreetName;

-}

-/**

- * The value as displayed in the Property Sheet. Will not print default values

- * @return java.lang.String

- */

-public String toString() {

-	StringBuffer outStringBuffer = new StringBuffer();

-	if (!getAptBox().equals(APTBOX_DEFAULT)) {

-		outStringBuffer.append(getAptBox());

-		outStringBuffer.append(", "); //$NON-NLS-1$

-	}

-	if (!getBuildNo().equals(BUILD_NO_DEFAULT)) {

-		outStringBuffer.append(getBuildNo());

-		outStringBuffer.append(" "); //$NON-NLS-1$

-	}

-	if (!getStreetName().equals(STREETNAME_DEFAULT)) {

-		outStringBuffer.append(getStreetName());

-	}

-	return outStringBuffer.toString();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserEditor.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserEditor.java
deleted file mode 100644
index 16f86b4..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserEditor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import org.eclipse.jface.text.Document;

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

-import org.eclipse.ui.editors.text.TextEditor;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

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

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

-

-/**

- * This class implements the User editor.

- */

-public class UserEditor extends TextEditor {

-	private ContentOutlinePage userContentOutline;

-/**

- * UserEditor default Constructor

- */

-public UserEditor() {

-	super();

-}

-/* (non-Javadoc)

- * Method declared on WorkbenchPart

- */

-public void createPartControl(Composite parent) {

-	super.createPartControl(parent);

-	getSourceViewer().setDocument(new Document(MessageUtil.getString("Editor_instructions"))); //$NON-NLS-1$

-}

-/* (non-Javadoc)

- * Method declared on IAdaptable

- */

-public Object getAdapter(Class adapter) {

-	if (adapter.equals(IContentOutlinePage.class)) {

-			return getContentOutline();

-	}

-	if (adapter.equals(IPropertySheetPage.class)) {

-			return getPropertySheet();

-	}

-	return super.getAdapter(adapter);

-}

-/**

- * Returns the content outline.

- */

-protected ContentOutlinePage getContentOutline() {

-	if (userContentOutline == null) {

-		//Create a property outline page using the parsed result of passing in the document provider.

-		userContentOutline =

-			new PropertySheetContentOutlinePage(

-				new UserFileParser().parse(getDocumentProvider()));

-	}

-	return userContentOutline;

-}

-/**

- * Returns the property sheet.

- */

-protected IPropertySheetPage getPropertySheet() {

-	return new PropertySheetPage();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java
deleted file mode 100644
index 71bfbbe..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java
+++ /dev/null
@@ -1,505 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.util.Vector;

-

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

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

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

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

-

-/**

- * A User Element

- */

-public class UserElement extends OrganizationElement {

-

-	// Properties

-	private Name fullName;

-	private Address address;

-	private String phoneNumber;

-	private EmailAddress emailAddress;

-	private Boolean coop;

-	private Birthday birthday;

-	private Float salary;

-	private RGB hairColor;

-	private RGB eyeColor;

-

-	// Property default values

-	private Name fullName_Default;

-	private Address address_Default;

-	private String phoneNumber_Default= "555-1111"; //$NON-NLS-1$

-	private EmailAddress emailAddress_Default;

-	private Boolean coop_Default;

-	private Birthday birthday_Default;

-	private Float salary_Default;

-	private RGB hairColor_Default;

-	private RGB eyeColor_Default;

-

-	// Property unique keys

-	public static final String P_ID_PHONENUMBER = "User.phonenumber"; //$NON-NLS-1$

-	public static final String P_ID_ADDRESS = "User.address"; //$NON-NLS-1$

-	public static final String P_ID_FULLNAME = "User.fullname"; //$NON-NLS-1$

-	public static final String P_ID_EMAIL = "User.email"; //$NON-NLS-1$

-	public static final String P_ID_COOP = "User.coop student"; //$NON-NLS-1$

-	public static final String P_ID_BDAY = "User.birthday"; //$NON-NLS-1$

-	public static final String P_ID_SALARY = "User.salary"; //$NON-NLS-1$

-	public static final String P_ID_HAIRCOLOR = "User.haircolor"; //$NON-NLS-1$

-	public static final String P_ID_EYECOLOR = "User.eyecolor"; //$NON-NLS-1$

-

-	// Property display keys

-	public static final String P_PHONENUMBER = MessageUtil.getString("phonenumber"); //$NON-NLS-1$

-	public static final String P_ADDRESS = MessageUtil.getString("address"); //$NON-NLS-1$

-	public static final String P_FULLNAME = MessageUtil.getString("fullname"); //$NON-NLS-1$

-	public static final String P_EMAIL = MessageUtil.getString("email"); //$NON-NLS-1$

-	public static final String P_COOP = MessageUtil.getString("coop_student"); //$NON-NLS-1$

-	public static final String P_BDAY = MessageUtil.getString("birthday"); //$NON-NLS-1$

-	public static final String P_SALARY = MessageUtil.getString("salary"); //$NON-NLS-1$

-	public static final String P_HAIRCOLOR = MessageUtil.getString("haircolor"); //$NON-NLS-1$

-	public static final String P_EYECOLOR = MessageUtil.getString("eyecolor"); //$NON-NLS-1$

-

-	// Help context ids

-	private static final String PHONE_NUMBER_CONTEXT ="org.eclipse.ui.examples.propertysheet.phone_number_context"; //$NON-NLS-1$

-	private static final String ADDRESS_CONTEXT ="org.eclipse.ui.examples.propertysheet.address_context"; //$NON-NLS-1$

-	private static final String FULL_NAME_CONTEXT ="org.eclipse.ui.examples.propertysheet.full_name_context"; //$NON-NLS-1$

-	private static final String EMAIL_CONTEXT ="org.eclipse.ui.examples.propertysheet.email_context"; //$NON-NLS-1$

-	private static final String COOP_CONTEXT ="org.eclipse.ui.examples.propertysheet.coop_context"; //$NON-NLS-1$

-	private static final String BIRTHDAY_CONTEXT ="org.eclipse.ui.examples.propertysheet.birthday_context"; //$NON-NLS-1$

-	private static final String SALARY_CONTEXT ="org.eclipse.ui.examples.propertysheet.salary_context"; //$NON-NLS-1$

-	private static final String HAIR_COLOR__CONTEXT ="org.eclipse.ui.examples.propertysheet.hair_color_context"; //$NON-NLS-1$

-	private static final String EYE_COLOR_CONTEXT ="org.eclipse.ui.examples.propertysheet.eye_color_context"; //$NON-NLS-1$

-

-	// Property Category

-	public static final String P_CONTACTINFO = MessageUtil.getString("contact"); //$NON-NLS-1$

-	public static final String P_PERSONELINFO = MessageUtil.getString("personel"); //$NON-NLS-1$

-	public static final String P_PERSONALINFO = MessageUtil.getString("personal"); //$NON-NLS-1$

-

-	// Property Values

-	public static final Integer P_VALUE_TRUE = new Integer(0);

-	public static final Integer P_VALUE_FALSE = new Integer(1);

-	public static final String P_VALUE_TRUE_LABEL = MessageUtil.getString("true"); //$NON-NLS-1$

-	public static final String P_VALUE_FALSE_LABEL = MessageUtil.getString("false"); //$NON-NLS-1$

-

-

-	static private class BooleanLabelProvider extends LabelProvider {

-		public String getText(Object element) {

-			String[] values = new String[] {P_VALUE_TRUE_LABEL, P_VALUE_FALSE_LABEL};

-			return values[((Integer)element).intValue()];

-		}

-	}

-

-

-	//

-	static private Vector descriptors;

-	static {

-		descriptors = new Vector();

-		PropertyDescriptor propertyDescriptor;

-		

-		///

-		propertyDescriptor = new TextPropertyDescriptor(P_ID_PHONENUMBER, P_PHONENUMBER);

-		propertyDescriptor.setCategory(P_CONTACTINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {PHONE_NUMBER_CONTEXT});

-		descriptors.addElement(propertyDescriptor);

-

-		///

-		propertyDescriptor = new PropertyDescriptor(P_ID_ADDRESS, P_ADDRESS);

-		propertyDescriptor.setCategory(P_CONTACTINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {ADDRESS_CONTEXT});

-		descriptors.addElement(propertyDescriptor);

-

-		///

-		propertyDescriptor = new TextPropertyDescriptor(P_ID_EMAIL, P_EMAIL);

-		propertyDescriptor.setCategory(P_CONTACTINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {EMAIL_CONTEXT});

-		propertyDescriptor.setValidator(new EmailAddressValidator());

-		descriptors.addElement(propertyDescriptor);

-

-		///

-		propertyDescriptor = new TextPropertyDescriptor(P_ID_FULLNAME, P_FULLNAME);

-		propertyDescriptor.setCategory(P_PERSONELINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {FULL_NAME_CONTEXT});

-		descriptors.addElement(propertyDescriptor);

-

-		///

-		propertyDescriptor = new PropertyDescriptor(P_ID_BDAY, P_BDAY);

-		propertyDescriptor.setCategory(P_PERSONELINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {BIRTHDAY_CONTEXT});

-		descriptors.addElement(propertyDescriptor);

-

-		///

-		propertyDescriptor = new ComboBoxPropertyDescriptor(P_ID_COOP, P_COOP, new String[] {P_VALUE_TRUE_LABEL, P_VALUE_FALSE_LABEL});

-		propertyDescriptor.setCategory(P_PERSONELINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {COOP_CONTEXT});

-		propertyDescriptor.setLabelProvider(new BooleanLabelProvider());

-		descriptors.addElement(propertyDescriptor);

-

-		///

-		propertyDescriptor = new TextPropertyDescriptor(P_ID_SALARY, P_SALARY);

-		//add custom validator to propertyDescriptor limiting salary values to be

-		//greator than zero

-		propertyDescriptor.setHelpContextIds(new Object[] {SALARY_CONTEXT});

-		propertyDescriptor.setFilterFlags(new String[] {IPropertySheetEntry.FILTER_ID_EXPERT});

-		propertyDescriptor.setValidator(

-			new ICellEditorValidator(){

-				public String isValid(Object value){

-					if(value == null)

-						return MessageUtil.getString("salary_is_invalid"); //$NON-NLS-1$

-					//

-					Float trySalary;

-					try {

-						trySalary = new Float(Float.parseFloat((String)value));

-					} catch (NumberFormatException e) {

-						return MessageUtil.getString("salary_is_invalid"); //$NON-NLS-1$

-					}

-					if(trySalary.floatValue() < 0.0)

-						return MessageUtil.getString("salary_must_be_greator_than_zero"); //$NON-NLS-1$

-					return null;

-				}	

-		});			

-		propertyDescriptor.setCategory(P_PERSONELINFO);

-		descriptors.addElement(propertyDescriptor);

-

-		/// HairColor

-		propertyDescriptor = new ColorPropertyDescriptor(P_ID_HAIRCOLOR, P_HAIRCOLOR);

-		propertyDescriptor.setCategory(P_PERSONALINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {HAIR_COLOR__CONTEXT});

-		descriptors.addElement(propertyDescriptor);

-		

-		/// EyeColor

-		propertyDescriptor = new ColorPropertyDescriptor(P_ID_EYECOLOR, P_EYECOLOR);

-		propertyDescriptor.setCategory(P_PERSONALINFO);

-		propertyDescriptor.setHelpContextIds(new Object[] {EYE_COLOR_CONTEXT});

-		descriptors.addElement(propertyDescriptor);

-

-		//gets descriptors from parent, warning name-space collision may occur

-		Vector parentDescriptors = OrganizationElement.getDescriptors();

-		for (int i = 0; i < parentDescriptors.size(); i++) {

-			descriptors.addElement(parentDescriptors.elementAt(i));

-		}

-	}

-/**

- * Constructor. Default visibility only called from GroupElement.createSubGroup()

- * Creates a new UserElement within the passed parent GroupElement,

- * *

- * @param name the name 

- * @param parent the parent

- */

-UserElement(String name, GroupElement parent) {

-	super(name, parent);

-}

-/**

- * Returns the address

- */

-private Address getAddress() {

-	if (address == null)

-		address = new Address();

-	return address;

-}

-/**

- * Returns the birthday

- */

-private Birthday getBirthday() {

-	if(birthday == null)

-		birthday = new Birthday();

-	return birthday;

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public Object[] getChildren(Object o) {

-	return new Object[0];

-}

-/**

- * Returns the coop

- */

-private Boolean getCoop() {

-	if(coop == null)

-		coop = new Boolean(false);

-	return coop;

-}

-/**

- * Returns the descriptors

- */

-static Vector getDescriptors()

-{

-	return descriptors;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this.toString();

-}

-/**

- * Returns the email address

- */

-EmailAddress getEmailAddress() {

-	if(emailAddress == null)

-		emailAddress = new EmailAddress();

-	return emailAddress;

-}

-/**

- * Returns the eye color

- */

-private RGB getEyeColor() {

-	if (eyeColor == null)

-		eyeColor = new RGB(60, 60, 60);	

-	return eyeColor;

-}

-/**

- * Returns the full name

- */

-private Name getFullName() {

-	if (fullName == null)

-		fullName = new Name(getName());	

-	return fullName;

-}

-/**

- * Returns the hair color

- */

-private RGB getHairColor() 	{

-	if (hairColor == null)

-		hairColor = new RGB(255, 255, 255);	

-	return hairColor;

-}

-/**

- * Returns the phone number

- */

-private String getPhoneNumber(){

-	return phoneNumber;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	return (IPropertyDescriptor[])getDescriptors().toArray(new IPropertyDescriptor[getDescriptors().size()]);

-}

-/** 

- * The <code>Userment</code> implementation of this

- * <code>IPropertySource</code> method returns the following properties

- *

- *	1) P_ADDRESS returns Address (IPropertySource), the address of this user

- * 	2) P_FULLNAME returns Name (IPropertySource), the full name of this user

- *  3) P_PHONENUMBER returns String, the phone number of this user

- *  4) P_EMAIL returns EmailAddress (IPropertySource), the email address of this user

- *  5) P_COOP returns Boolean, whether the individual is a coop student or not

- *  6) P_BDAY returns Birthday

- *  7) P_SALARY return java.lang.Float

- *  8) P_HAIRCOLOR, expects RGB

- *  9) P_EYECOLOR, expects RGB

- */

-public Object getPropertyValue(Object propKey) {

-	if (propKey.equals(P_ID_ADDRESS))

-		return getAddress();

-	if (propKey.equals(P_ID_FULLNAME))

-		return getFullName();

-	if (propKey.equals(P_ID_PHONENUMBER))

-		return getPhoneNumber();

-	if (propKey.equals(P_ID_EMAIL))

-		return getEmailAddress();

-	if (propKey.equals(P_ID_COOP))

-		return getCoop().equals(Boolean.TRUE) ? P_VALUE_TRUE : P_VALUE_FALSE;

-	if (propKey.equals(P_ID_BDAY))

-		return getBirthday();

-	if (propKey.equals(P_ID_SALARY))

-		return getSalary().toString();

-	if (propKey.equals(P_ID_HAIRCOLOR))

-		return getHairColor();

-	if (propKey.equals(P_ID_EYECOLOR))

-		return getEyeColor();

-	return super.getPropertyValue(propKey);

-}

-/**

- * Returns the salary

- */

-private Float getSalary() {

-	if(salary==null)

-		salary = new Float(0);

-	return salary;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object property) {

-	if (property.equals(P_ID_ADDRESS))

-		return getAddress() != address_Default;

-	if (property.equals(P_ID_FULLNAME))

-		return getFullName() != fullName_Default;

-	if (property.equals(P_ID_PHONENUMBER))

-		return getPhoneNumber() != phoneNumber_Default;

-	if (property.equals(P_ID_EMAIL))

-		return getEmailAddress() != emailAddress_Default;

-	if (property.equals(P_ID_COOP))

-		return getCoop() != coop_Default;

-	if (property.equals(P_ID_BDAY))

-		return getBirthday() != birthday_Default;

-	if (property.equals(P_ID_SALARY))

-		return getSalary() != salary_Default;

-	if (property.equals(P_ID_HAIRCOLOR))

-		return getHairColor() != hairColor_Default;

-	if (property.equals(P_ID_EYECOLOR))

-		return getEyeColor() != eyeColor_Default;

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on OrganizationElement

- */

-public boolean isUser() {

-	return true;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void resetPropertyValue(Object property) {

-	if (property.equals(P_ID_ADDRESS)) {

-		setAddress(address_Default);

-		return;

-	}

-	if (property.equals(P_ID_FULLNAME)) {

-		setFullName(fullName_Default);

-		return;

-	}

-	if (property.equals(P_ID_PHONENUMBER)) {

-		setPhoneNumber(phoneNumber_Default);

-		return;

-	}

-	if (property.equals(P_ID_EMAIL)) {

-		setEmailAddress(emailAddress_Default);

-		return;

-	}

-	if (property.equals(P_ID_COOP)) {

-		setCoop(coop_Default);

-	}

-	if (property.equals(P_ID_BDAY)) {

-		setBirthday(birthday_Default);

-		return;

-	}

-	if (property.equals(P_ID_SALARY)) {

-		setSalary(salary_Default);

-		return;

-	}

-	if (property.equals(P_ID_HAIRCOLOR)) {

-		setHairColor(hairColor_Default);

-		return;

-	}

-	if (property.equals(P_ID_EYECOLOR)) {

-		setEyeColor(eyeColor_Default);

-		return;

-	}

-	super.resetPropertyValue(property);

-}

-/**

- * Sets the address

- */

-public void setAddress(Address newAddress) {

-	address = newAddress;

-}

-/**

- * Sets the birthday

- */

-public void setBirthday(Birthday newBirthday) {

-	birthday = new Birthday();

-}

-/**

- * Sets the coop

- */

-public void setCoop(Boolean newCoop) {

-	coop = newCoop;

-}

-/**

- *Sets the email address

- */

-public void setEmailAddress(EmailAddress newEmailAddress){

-	emailAddress = newEmailAddress;

-}

-/**

- * Sets eye color

- */

-public void setEyeColor(RGB newEyeColor) {

-	eyeColor = newEyeColor;

-}

-/**

- * Sets full name

- */

-public void setFullName(Name newFullName)

-{	fullName = newFullName;

-}

-/**

- * Sets hair color

- */

-public void setHairColor(RGB newHairColor) {

-	hairColor = newHairColor;

-}

-/**

- * Sets phone number

- */

-public void setPhoneNumber(String newPhoneNumber)

-{	phoneNumber = newPhoneNumber;

-}

-/** 

- * The <code>OrganizationElement</code> implementation of this

- * <code>IPropertySource</code> method 

- * defines the following Setable properties

- *

- *	1) P_ADDRESS, expects Address

- *	2) P_FULLNAME, expects Name

- *	3) P_PHONENUMBER, expects String

- *  4) P_EMAIL, expects EmailAddress.

- *  5) P_BOOLEAN, expects Boolean, whether the individual is a coop student or not

- *  6) P_BDAY, expects Birthday

- *  7) P_SALARY, expects java.lang.Float

- *  8) P_HAIRCOLOR, expects RGB

- *  9) P_EYECOLOR, expects RGB

- */

-public void setPropertyValue(Object propKey, Object val) {

-	// need to convert from String to domain objects

-	if (propKey.equals(P_ID_ADDRESS)) {

-		//setAddress((Address)val);

-		return;

-	}

-	if (propKey.equals(P_ID_FULLNAME)) {

-		setFullName(new Name((String)val));

-		return;

-	}

-	if (propKey.equals(P_ID_PHONENUMBER)) {

-		setPhoneNumber((String) val);

-		return;

-	}

-	if (propKey.equals(P_ID_EMAIL)) {

-		setEmailAddress(new EmailAddress((String)val));

-		return;

-	}

-	if (propKey.equals(P_ID_COOP)) {

-		setCoop(((Integer)val).equals(P_VALUE_TRUE) ? Boolean.TRUE : Boolean.FALSE);

-	}

-	if (propKey.equals(P_ID_BDAY)) {

-		//setBirthday((Birthday)val);

-		return;

-	}

-	if (propKey.equals(P_ID_SALARY)) {

-		try {

-			setSalary(new Float(Float.parseFloat((String)val)));

-		} catch (NumberFormatException e) {

-			setSalary(salary_Default);

-		}

-		return;

-	}

-	if (propKey.equals(P_ID_HAIRCOLOR)) {

-		setHairColor((RGB) val);

-		return;

-	}

-	if (propKey.equals(P_ID_EYECOLOR)) {

-		setEyeColor((RGB) val);

-		return;

-	}

-	super.setPropertyValue(propKey, val);

-}

-/**

- * Sets the salary

- */

-void setSalary(Float newSalary) {

-	salary = newSalary;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserFileParser.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserFileParser.java
deleted file mode 100644
index a381941..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserFileParser.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.ui.examples.propertysheet;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

-import org.eclipse.ui.texteditor.IDocumentProvider;

-

-/**

- * This class is an example of the implementation of a simple parser.

- */

-public class UserFileParser {

-/**

- * Return the fabricated result for this example.

- *

- */

-private static IAdaptable getFabricatedResult() {

-	// returns fabricated input. 

-	GroupElement root = new GroupElement(MessageUtil.getString("Everybody"), null); //$NON-NLS-1$

-	GroupElement userGroup = root.createSubGroup(MessageUtil.getString("Company_Inc")); //$NON-NLS-1$

-	GroupElement ottGroup = userGroup.createSubGroup(MessageUtil.getString("Waterloo_Lab")); //$NON-NLS-1$

-	userGroup.createSubGroup(MessageUtil.getString("Toronto_Lab")); //$NON-NLS-1$

-	userGroup.createSubGroup(MessageUtil.getString("Hamilton_Lab")); //$NON-NLS-1$

-	userGroup.createSubGroup(MessageUtil.getString("London_Lab")); //$NON-NLS-1$

-	userGroup.createSubGroup(MessageUtil.getString("Grimsby_Lab")); //$NON-NLS-1$

-	GroupElement uiTeam = ottGroup.createSubGroup(MessageUtil.getString("Team1")); //$NON-NLS-1$

-	//

-	UserElement user1 = uiTeam.createUser("richard"); //$NON-NLS-1$

-	user1.setFullName(new Name(MessageUtil.getString("Richard_Zokol"))); //$NON-NLS-1$

-	user1.setEmailAddress(new EmailAddress(MessageUtil.getString("rzokol@company.com"))); //$NON-NLS-1$

-	user1.setPhoneNumber("x789"); //$NON-NLS-1$

-	user1.setAddress(new Address(new StreetAddress(232, MessageUtil.getString("Champlain")), MessageUtil.getString("Hull"), new Integer(5), MessageUtil.getString("A1B2C3"))); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$

-	user1.setBirthday(new Birthday(18, 1, 1981));

-	user1.setCoop(new Boolean(true));

-	user1.setHairColor(new RGB(0, 0, 0));

-	user1.setEyeColor(new RGB(0, 0, 0));

-	//

-	UserElement user2 = uiTeam.createUser("george"); //$NON-NLS-1$

-	user2.setFullName(new Name(MessageUtil.getString("George_Knudson"))); //$NON-NLS-1$

-	user2.setEmailAddress(new EmailAddress(MessageUtil.getString("gknudson@company.com"))); //$NON-NLS-1$

-	user2.setPhoneNumber("x678"); //$NON-NLS-1$

-	user2.setAddress(new Address(new StreetAddress(), MessageUtil.getString("Toronto"), new Integer(4), MessageUtil.getString("A1B2C3"))); //$NON-NLS-2$ //$NON-NLS-1$

-	user2.setBirthday(new Birthday(7, 5, 1978));

-	user2.setCoop(new Boolean(true));

-	user2.setHairColor(new RGB(0, 0, 0));

-	user2.setEyeColor(new RGB(0, 0, 0));

-

-	//

-	UserElement user3 = uiTeam.createUser("arnold"); //$NON-NLS-1$

-	user3.setFullName(new Name(MessageUtil.getString("Arnold_Palmer"))); //$NON-NLS-1$

-	user3.setEmailAddress(new EmailAddress(MessageUtil.getString("apalmer@company.com"))); //$NON-NLS-1$

-	user3.setPhoneNumber("x567"); //$NON-NLS-1$

-	user3.setAddress(new Address(new StreetAddress(), MessageUtil.getString("Ottawa"), new Integer(4), MessageUtil.getString("A1B2C3"))); //$NON-NLS-2$ //$NON-NLS-1$

-	user3.setBirthday(new Birthday(11, 23, 1962));

-	user3.setHairColor(new RGB(0, 0, 0));

-	user3.setEyeColor(new RGB(0, 0, 0));

-	

-	//

-	UserElement user4 = uiTeam.createUser("lee"); //$NON-NLS-1$

-	user4.setFullName(new Name(MessageUtil.getString("Lee_Trevino"))); //$NON-NLS-1$

-	user4.setEmailAddress(new EmailAddress(MessageUtil.getString("ltrevino@company.com"))); //$NON-NLS-1$

-	user4.setPhoneNumber("x456"); //$NON-NLS-1$

-	user4.setAddress(new Address(new StreetAddress(), MessageUtil.getString("Ottawa"), new Integer(4), MessageUtil.getString("A1B2C3"))); //$NON-NLS-2$ //$NON-NLS-1$

-	//

-	UserElement user5 = uiTeam.createUser("tiger"); //$NON-NLS-1$

-	user5.setFullName(new Name(MessageUtil.getString("Tiger_Woods"))); //$NON-NLS-1$

-	user5.setEmailAddress(new EmailAddress(MessageUtil.getString("twoods@company.com"))); //$NON-NLS-1$

-	user5.setPhoneNumber("x345"); //$NON-NLS-1$

-	user5.setAddress(new Address(new StreetAddress(), MessageUtil.getString("Ottawa"), new Integer(4), MessageUtil.getString("A1B2C3"))); //$NON-NLS-2$ //$NON-NLS-1$

-	//

-	UserElement user6 = uiTeam.createUser("jack"); //$NON-NLS-1$

-	user6.setFullName(new Name(MessageUtil.getString("Jack_Nicklaus"))); //$NON-NLS-1$

-	user6.setEmailAddress(new EmailAddress(MessageUtil.getString("jnicklaus@company.com"))); //$NON-NLS-1$

-	user6.setPhoneNumber("x234 "); //$NON-NLS-1$

-	user6.setAddress(new Address(new StreetAddress(), MessageUtil.getString("Ottawa"), new Integer(4), MessageUtil.getString("A1B2C3"))); //$NON-NLS-2$ //$NON-NLS-1$

-	//

-	UserElement greg = uiTeam.createUser("weslock"); //$NON-NLS-1$

-	greg.setFullName(new Name(MessageUtil.getString("Weslock"))); //$NON-NLS-1$

-	greg.setEmailAddress(new EmailAddress(MessageUtil.getString("weslock@company.com"))); //$NON-NLS-1$

-	greg.setPhoneNumber("x123"); //$NON-NLS-1$

-	greg.setAddress(new Address(new StreetAddress(), MessageUtil.getString("Ottawa"), new Integer(4), MessageUtil.getString("A1B2C3"))); //$NON-NLS-2$ //$NON-NLS-1$

-

-	return root;

-}

-/**

- * Parse the input given by the argument. For this example we do no parsing and return

- * a fabricated result.

- *

- */

-public IAdaptable parse(IDocumentProvider documentProvider) {

-

-	return getFabricatedResult();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/messages.properties b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/messages.properties
deleted file mode 100644
index f0076fa..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/messages.properties
+++ /dev/null
@@ -1,98 +0,0 @@
-Alberta=Alberta

-British_Columbia=British Columbia

-City=City

-Manitoba=Manitoba

-New_Brunswick=New Brunswick

-Newfoundland=Newfoundland

-North_West_Territories=North West Territories

-Nova_Scotia=Nova Scotia

-Nunavut=Nunavut

-Ontario=Ontario

-PostalCode=PostalCode

-Prince_Edward_Island=Prince Edward Island

-Province=Province

-Quebec=Quebec

-Saskatchewan=Saskatchewan

-Street=Street

-Yukon=Yukon

-_is_an_invalid_format_for_a_postal_code={0} is an invalid format for a postal code

-postal_code_is_incomplete=postal code is incomplete

-unspecified_city=unspecified city

-April=April

-August=August

-December=December

-February=February

-January=January

-July=July

-June=June

-March=March

-May=May

-November=November

-October=October

-September=September

-day=day

-month=month

-year=year

-domain=domain

-emailaddress_cannot_be_set_to_null=emailaddress cannot be set to null

-invalid_email_address_format_should_have_been_validated=invalid email address format, should have been validated

-unknownDomain=unknownDomain

-unknownUser=unknownUser

-userid=userid

-email_address_does_not_have_a_valid_format=email address does not have a valid format

-email_address_is_incomplete=email address is incomplete

-FirstName=FirstName

-LastName=LastName

-Middle=Middle

-name=name

-apt.no_or_box.no=apt.no or box.no

-building_number=building number

-street=street

-unspecified=unspecified

-Editor_instructions=Click on the items in the content outline\nto see their properties

-address=address

-birthday=birthday

-contact=contact

-coop_student=coop student

-email=email

-eyecolor=eyecolor

-false=false

-fullname=fullname

-haircolor=haircolor

-personal=personal

-personel=personel

-phonenumber=phonenumber

-salary=salary

-salary_is_invalid=salary is invalid

-salary_must_be_greator_than_zero=salary must be greator than zero

-true=true

-A1B2C3=A1B2C3

-Arnold_Palmer=Arnold Palmer

-Champlain=Champlain

-Company_Inc=Company Inc.

-Everybody=Everybody

-George_Knudson=George Knudson

-Grimsby_Lab=Grimsby Lab

-Hamilton_Lab=Hamilton Lab

-Hull=Hull

-Jack_Nicklaus=Jack Nicklaus

-Lee_Trevino=Lee Trevino

-London_Lab=London Lab

-Ottawa=Ottawa

-Richard_Zokol=Richard Zokol

-Team1=Team1

-Tiger_Woods=Tiger Woods

-Toronto=Toronto

-Toronto_Lab=Toronto Lab

-Waterloo_Lab=Waterloo Lab

-Weslock=Weslock

-apalmer@company.com=apalmer@company.com

-gknudson@company.com=gknudson@company.com

-jnicklaus@company.com=jnicklaus@company.com

-ltrevino@company.com=ltrevino@company.com

-rzokol@company.com=rzokol@company.com

-twoods@company.com=twoods@company.com

-weslock@company.com=weslock@company.com

-Popup_Menu_Action_executed=Popup Menu Action executed

-Property_Sheet_Example=Property Sheet Example

-

diff --git a/examples/org.eclipse.ui.examples.propertysheet/HelpContexts.xml b/examples/org.eclipse.ui.examples.propertysheet/HelpContexts.xml
deleted file mode 100644
index a5a47bc..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/HelpContexts.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<contexts>

-

-   <context  id="phone_number_context" >

-      <description>Help for phone number</description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="address_context" >

-      <description>Help for address </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="full_name_context" >

-      <description>Help for full name </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="email_context" >

-      <description>Help for email address </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="coop_context" >

-      <description>Help for coop </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="birthday_context" >

-      <description>Help for birthday </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="salary_context" >

-      <description>Help for salary </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="hair_color_context" >

-      <description>Help for hair color </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-   <context  id="eye_color_context" >

-      <description>Help for eye color </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 1"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 2"/>

-   </context>

-

-</contexts>
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.propertysheet/about.html b/examples/org.eclipse.ui.examples.propertysheet/about.html
deleted file mode 100644
index 9a15e5c..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body>

-<body lang=EN-US link=blue vlink=purple>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">About This Plug-in</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>1st November, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org makes available all content in this plug-in.  The plug-in is provided to you under the terms and conditions of the

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a>.  For purposes of the Common Public License, &quot;Program&quot; will mean the plug-in.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.propertysheet/build.properties b/examples/org.eclipse.ui.examples.propertysheet/build.properties
deleted file mode 100644
index ab2bc7f..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.propertysheet.jar = Eclipse UI Examples PropertySheet/

-

-bin.includes = doc-html/,\

-				icons/,\

-				.options,\

-				about.html,\

-				doc.zip,\

-				HelpContexts.xml,\

-				plugin.properties,\

-				plugin.xml,\

-				*.jar

diff --git a/examples/org.eclipse.ui.examples.propertysheet/doc-html/hglegal.htm b/examples/org.eclipse.ui.examples.propertysheet/doc-html/hglegal.htm
deleted file mode 100644
index b071dbd..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/doc-html/hglegal.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]">

-   <title>Legal Notices</title>

-</head>

-<body>

-

-<h3>

-<a NAME="Notices"></a>Notices</h3>

-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.propertysheet/doc-html/ngibmcpy.gif b/examples/org.eclipse.ui.examples.propertysheet/doc-html/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/doc-html/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.propertysheet/doc-html/ui_propertysheet_ex.html b/examples/org.eclipse.ui.examples.propertysheet/doc-html/ui_propertysheet_ex.html
deleted file mode 100644
index 00ba3eb..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/doc-html/ui_propertysheet_ex.html
+++ /dev/null
@@ -1,47 +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>Desktop - Property Sheet Example</title>

-</head>

-<body>

-

-<h2>

-<b>Example - Property Sheet</b></h2>

-

-<h3>

-Introduction</h3>

-The Property Sheet Example adds an editor for files with the .usr extension

-and also demonstrates how to add properties and outline views on a file.

-<br>&nbsp;

-<h3>

-Running the example</h3>

-To start using the Property Sheet Example, create a file with extension

-.usr.&nbsp;&nbsp; Open the file and the Outline and Properties views to

-see the example in action.&nbsp; Click on items in the Outline view and

-look in the Properties view for details of the selected item in the Outline

-view.&nbsp; The people items in the list show the most detail in the Properties

-view.

-<h4>

-<b>Creating a new usr file</b></h4>

-Create a new file with file extension .usr.&nbsp; From the File menu, select

-New and then select Other... from the sub-menu.&nbsp; Click on Simple in

-the wizard, then select

-<br>File in the list on the left.&nbsp; Click on Next to supply the file

-name (make sure the extension is .usr) and the folder in which the file

-should be contained.

-<br>&nbsp;

-<h3>

-Details</h3>

-The Property Sheet Example demonstrates how to provide properties to the

-Property Sheet View.

-<p>The tree viewer of the Content Outline View contains and presents OrganizationElements.

-When an element is selected in the Content Outline View the Workspace will

-invoke <tt>getAdapter</tt>

-on the selected OrganizationElement. If an adapter is requested for IPropertySource,

-the OrganizationElement returns itself as it impements IPropertySource

-The Property Sheet View then use the Organization Element as it source.

-<br>&nbsp;

-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.propertysheet/doc.zip b/examples/org.eclipse.ui.examples.propertysheet/doc.zip
deleted file mode 100644
index 41e8aa9..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/doc.zip
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.propertysheet/icons/basic/obj16/usereditor.gif b/examples/org.eclipse.ui.examples.propertysheet/icons/basic/obj16/usereditor.gif
deleted file mode 100644
index 4e25088..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/icons/basic/obj16/usereditor.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.propertysheet/icons/full/obj16/usereditor.gif b/examples/org.eclipse.ui.examples.propertysheet/icons/full/obj16/usereditor.gif
deleted file mode 100644
index 64d7907..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/icons/full/obj16/usereditor.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.propertysheet/plugin.properties b/examples/org.eclipse.ui.examples.propertysheet/plugin.properties
deleted file mode 100644
index 2f01111..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-Plugin.name = User File Editor

-Editors.UserEditor = User File Editor

-PopupMenus.action = Show Action

diff --git a/examples/org.eclipse.ui.examples.propertysheet/plugin.xml b/examples/org.eclipse.ui.examples.propertysheet/plugin.xml
deleted file mode 100644
index cb4cb12..0000000
--- a/examples/org.eclipse.ui.examples.propertysheet/plugin.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<plugin

-   name = "%Plugin.name"

-   id = "org.eclipse.ui.examples.propertysheet"

-   version = "1.0"

-   provider-name = "Object Technology International, Inc."

-   class="org.eclipse.ui.examples.propertysheet.PropertySheetPlugin">

-

-<requires>

-   <import plugin="org.eclipse.ui"/>

-   <import plugin="org.eclipse.core.resources"/>

-</requires>

-

-

-<runtime>

-  <library name="propertysheet.jar" /> 

-</runtime>

-

-<extension

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

-   <editor

-      id = "org.eclipse.ui.examples.propertysheet.UserEditor"

-      name="%Editors.UserEditor"

-      icon="icons/basic/obj16/usereditor.gif"

-      extensions="usr"

-      class="org.eclipse.ui.examples.propertysheet.UserEditor">

-   </editor>

-</extension>

-

-<extension point = "org.eclipse.ui.popupMenus">

-   	<objectContribution

-	  	id="org.eclipse.ui.examples.propertysheet"

-	    objectClass="org.eclipse.ui.examples.propertysheet.UserElement">

-	    <action id="org.eclipse.ui.examples.propertysheet.action1"

-    	   	label="%PopupMenus.action"

-       		menubarPath="additions"

-       		class="org.eclipse.ui.examples.propertysheet.PopupMenuActionDelegate"	

-       		enablesFor="1">

-	    </action>

-   </objectContribution>

-</extension>

-

-<extension point="org.eclipse.help.contexts"> 

-   <contexts name="HelpContexts.xml"/> 

-</extension>

-

-</plugin>

diff --git a/examples/org.eclipse.ui.examples.readmetool/.classpath b/examples/org.eclipse.ui.examples.readmetool/.classpath
deleted file mode 100644
index 031b202..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="Eclipse UI Examples Readme Tool"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt/swt.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.swt/swtsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resources.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resourcessrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtime.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtimesrc.zip"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/examples/org.eclipse.ui.examples.readmetool/.cvsignore b/examples/org.eclipse.ui.examples.readmetool/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.readmetool/.vcm_meta b/examples/org.eclipse.ui.examples.readmetool/.vcm_meta
deleted file mode 100644
index 9615b07..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/.vcm_meta
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<comment></comment>

-	<nature id="org.eclipse.jdt.core.javanature"/>

-	<reference project-name="org.eclipse.ui"/>

-	<builder name="org.eclipse.jdt.core.javabuilder">

-	</builder>

-</project-description>

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/AdaptableList.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/AdaptableList.java
deleted file mode 100644
index a14bd52..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/AdaptableList.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.model.IWorkbenchAdapter;

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

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

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

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

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

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

-import java.util.*;

-

-/**

- * A list of adaptable objects.  This is a generic list that can

- * be used to display an arbitrary set of adaptable objects in the workbench.

- * Also implements the IWorkbenchAdapter interface for simple display

- * and navigation.

- */

-public class AdaptableList implements IWorkbenchAdapter, IAdaptable {

-	protected List children = new ArrayList();

-/**

- * Creates a new adaptable list with the given children.

- */

-public AdaptableList() {

-}

-/**

- * Creates a new adaptable list with the given children.

- */

-public AdaptableList(IAdaptable[] newChildren) {

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

-		children.add(newChildren[i]);

-	}

-}

-/**

- * Adds all the adaptable objects in the given enumeration to this list.

- * Returns this list.

- */

-public AdaptableList add(Iterator iterator) {

-	while (iterator.hasNext()) {

-		add((IAdaptable)iterator.next());

-	}

-	return this;

-}

-/**

- * Adds the given adaptable object to this list.

- * Returns this list.

- */

-public AdaptableList add(IAdaptable adaptable) {

-	children.add(adaptable);

-	return this;

-}

-/* (non-Javadoc)

- * Method declared on IAdaptable

- */

-public Object getAdapter(Class adapter) {

-	if (adapter == IWorkbenchAdapter.class) return this;

-	return null;

-}

-/**

- * Returns the elements in this list.

- */

-public Object[] getChildren() {

-	return children.toArray();

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public Object[] getChildren(Object o) {

-	return children.toArray();

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public ImageDescriptor getImageDescriptor(Object object) {

-	return null;

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public String getLabel(Object object) {

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

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public Object getParent(Object object) {

-	return null;

-}

-/**

- * Removes the given adaptable object from this list.

- */

-public void remove(IAdaptable adaptable) {

-	children.remove(adaptable);

-}

-/**

- * Returns the number of items in the list

- */

-public int size() {

-	return children.size();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DefaultSectionsParser.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DefaultSectionsParser.java
deleted file mode 100644
index 4f8cbb0..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DefaultSectionsParser.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-import java.io.*;

-import java.util.Enumeration;

-import java.util.Hashtable;

-import java.util.Vector;

-

-/**

- * This class is a simple parser implementing the IReadmeFileParser

- * interface. It parses a Readme file into sections based on the

- * existence of numbered section tags in the input. A line beginning

- * with a number followed by a dot will be taken as a section indicator

- * (for example, 1., 2., or 12.). 

- * As well, a line beginning with a subsection-style series of numbers

- * will also be taken as a section indicator, and can be used to 

- * indicate subsections (for example, 1.1, or 1.1.12).

- */

-public class DefaultSectionsParser implements IReadmeFileParser {

-/**

- * Returns the mark element that is the logical parent

- * of the given mark number.  Each dot in a mark number

- * represents a parent-child separation.  For example,

- * the parent of 1.2 is 1, the parent of 1.4.1 is 1.4.

- * Returns null if there is no appropriate parent.

- */

-protected IAdaptable getParent(Hashtable toc, String number) {

-	int lastDot = number.lastIndexOf('.');

-	if (lastDot < 0)

-		return null;

-	String parentNumber = number.substring(0, lastDot);

-	return (IAdaptable) toc.get(parentNumber);

-}

-/**

- * Returns a string containing the contents of the given

- * file.  Returns an empty string if there were any errors

- * reading the file.

- */

-protected String getText(IFile file) {

-	try {

-		InputStream in = file.getContents();

-		ByteArrayOutputStream out = new ByteArrayOutputStream();

-		byte[] buf = new byte[1024];

-		int read = in.read(buf);

-		while (read > 0) {

-			out.write(buf, 0, read);

-			read = in.read(buf);

-		}

-		return out.toString();

-	} catch (CoreException e) {

-	} catch (IOException e) {

-	}

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

-}

-/**

- * Parses the input given by the argument.

- *

- * @param file  the element containing the input text

- * @return an element collection representing the parsed input

- */

-public MarkElement[] parse(IFile file) {

-	Hashtable markTable = new Hashtable(40);

-	Vector topLevel = new Vector();

-	String s = getText(file);

-	int start = 0;

-	int end = -1;

-	int lineno = 0;

-	int lastlineno = 0;

-	MarkElement lastme = null;

-	int ix;

-

-	// parse content for headings

-	ix = s.indexOf('\n', start);

-	while (ix != -1) {

-		start = end + 1;

-		end = ix = s.indexOf('\n', start);

-		lineno++;

-		if (ix != -1) {

-			// skip blanks

-			while (s.charAt(start) == ' ' || s.charAt(start) == '\t') {

-				start++;

-			}

-			if (Character.isDigit(s.charAt(start))) {

-				if (lastme != null) {

-					lastme.setNumberOfLines(lineno - lastlineno - 1);

-				}

-				lastlineno = lineno;

-			    String markName = parseHeading(s, start, end);

-

-			    //get the parent mark, if any.

-			    String markNumber = parseNumber(markName);

-			    IAdaptable parent = getParent(markTable, markNumber);

-			    if (parent == null)

-				    parent = file;

-

-				MarkElement me = new MarkElement(parent, markName, start, end - start);

-				lastme = me;

-				

-				markTable.put(markNumber, me);

-				if (parent == file) {

-					topLevel.add(me);

-				}

-			}

-		}

-	}

-	if (lastme != null) {

-		// set the number of lines for the last section

-		lastme.setNumberOfLines(lineno - lastlineno - 1);

-	}

-	MarkElement[] results = new MarkElement[topLevel.size()];

-	topLevel.copyInto(results);

-	return results;

-}

-/**

- * Creates a section name from the buffer and trims trailing

- * space characters.

- *

- * @param buffer  the string from which to create the section name

- * @param start  the start index

- * @param end  the end index

- * @return a section name

- */

-private String parseHeading(String buffer, int start, int end) {

-	while (Character.isWhitespace(buffer.charAt(end-1)) && end >start) {

-		end--;

-	}

-	return buffer.substring(start, end);

-}

-/**

- * Returns the number for this heading.  A heading consists

- * of a number (an arbitrary string of numbers and dots), followed by

- * arbitrary text.

- */

-protected String parseNumber(String heading) {

-	int start = 0;

-	int end = heading.length();

-	char c;

-	do {

-		c = heading.charAt(start++);

-	} while ((c == '.' || Character.isDigit(c)) && start < end);

-

-	//disregard trailing dots

-	while (heading.charAt(start-1) == '.' && start > 0) {

-		start--;

-	}

-	return heading.substring(0, start);

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DirtyStateContribution.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DirtyStateContribution.java
deleted file mode 100644
index 750fb71..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/DirtyStateContribution.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import org.eclipse.ui.*;

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

-import org.eclipse.swt.SWT;

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

-

-/**

- * This class demonstrates the contribution of a custom control to the 

- * status line for the readme editor.  The control shows the

- * dirty status of the editor.

- */

-public class DirtyStateContribution extends ControlContribution

-	implements IPropertyListener

-{

-	private Composite composite;

-	private Label label;

-	private IEditorPart activeEditor;

-/**

- * Creates a new DirtyStateContribution.

- */

-protected DirtyStateContribution() {

-	super("DirtyState"); //$NON-NLS-1$

-}

-/* (non-Javadoc)

- * Method declared on ControlContribution

- */

-protected Control createControl(Composite parent) {

-	// If the composite is good just return it.

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

-		return composite;

-		

-	// Create composite for border.

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

-	composite.setData(this);

-

-	// Create label inside composite.	

-	label = new Label(composite, SWT.NONE);

-	label.setSize(80, 15);

-	

-	updateState();

-	return composite;

-}

-/**

- * Called when an editor is activated.

- *

- * @see ReadmeEditorActionBarContributor#setActiveEditor(IEditorPart)

- */

-public void editorChanged(IEditorPart part) {

-	if (activeEditor != null) {

-		activeEditor.removePropertyListener(this);

-	}

-	activeEditor = part;

-	if (activeEditor != null) {

-		activeEditor.addPropertyListener(this);

-	}

-	updateState();

-}

-/* (non-Javadoc)

- * Method declared on IPropertyListener

- */

-public void propertyChanged(Object source, int propID) {

-	if (source instanceof IEditorPart)

-		updateState();

-}

-/**

- * Updates the state of the label.

- */

-private void updateState() {

-	if (label == null || label.isDisposed())

-		return;

-		

-	boolean saveNeeded = false;

-	if (activeEditor != null)

-		saveNeeded = activeEditor.isDirty();

-	if (saveNeeded)

-		label.setText(MessageUtil.getString("Save_Needed")); //$NON-NLS-1$

-	else

-		label.setText(MessageUtil.getString("Clean")); //$NON-NLS-1$

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/EditorActionDelegate.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/EditorActionDelegate.java
deleted file mode 100644
index c5db722..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/EditorActionDelegate.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-import org.eclipse.ui.*;

-

-/**

- * This class is used to demonstrate editor action extensions.

- * An extension should be defined in the readme plugin.xml.

- */

-public class EditorActionDelegate implements IEditorActionDelegate {

-	private IEditorPart editor;

-/**

- * Creates a new EditorActionDelegate.

- */

-public EditorActionDelegate() {

-}

-/* (non-Javadoc)

- * Method declared on IActionDelegate

- */

-public void run(IAction action) {

-	MessageDialog.openInformation(editor.getSite().getShell(),

-		MessageUtil.getString("Readme_Editor"),  //$NON-NLS-1$

-		MessageUtil.getString("Editor_Action_executed")); //$NON-NLS-1$

-}

-/** 

- * The <code>EditorActionDelegate</code> implementation of this

- * <code>IActionDelegate</code> method 

- *

- * Selection in the desktop has changed. Plugin provider

- * can use it to change the availability of the action

- * or to modify other presentation properties.

- *

- * <p>Action delegate cannot be notified about

- * selection changes before it is loaded. For that reason,

- * control of action's enable state should also be performed

- * through simple XML rules defined for the extension

- * point. These rules allow enable state control before

- * the delegate has been loaded.</p>

- */

-public void selectionChanged(IAction action, ISelection selection) {

-}

-/** 

- * The <code>EditorActionDelegate</code> implementation of this

- * <code>IEditorActionDelegate</code> method 

- *

- * The matching editor has been activated. Notification

- * guarantees that only editors that match the type for which 

- * this action has been registered will be tracked.

- *

- * @param action action proxy that represents this delegate in the desktop

- * @param editor the matching editor that has been activated

- */

-public void setActiveEditor(IAction action, IEditorPart editor) {

-	this.editor = editor;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeConstants.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeConstants.java
deleted file mode 100644
index bae4b05..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeConstants.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-/**

- * This interface contains constants for use only within the

- * Readme example.

- */

-public interface IReadmeConstants {

-	public static final String PLUGIN_ID ="org.eclipse.ui.examples.readmetool"; //$NON-NLS-1$

-	public static final String PREFIX = PLUGIN_ID+"."; //$NON-NLS-1$

-	public static final String P_CONTENT_OUTLINE=PREFIX+"content_outline"; //$NON-NLS-1$

-	public static final String P_SECTIONS=PREFIX+"sections"; //$NON-NLS-1$

-	public static final String EXTENSION = "readme"; //$NON-NLS-1$

-	public static final String TAG_PARSER = "parser"; //$NON-NLS-1$

-	public static final String ATT_CLASS = "class"; //$NON-NLS-1$

-	public static final String PP_SECTION_PARSER = "sectionParser"; //$NON-NLS-1$

-

-	// Preference constants

-	public static final String PRE_CHECK1=PREFIX+"check1"; //$NON-NLS-1$

-	public static final String PRE_CHECK2=PREFIX+"check2"; //$NON-NLS-1$

-	public static final String PRE_CHECK3=PREFIX+"check3"; //$NON-NLS-1$

-	public static final String PRE_RADIO_CHOICE = PREFIX+"radio_choice"; //$NON-NLS-1$

-	public static final String PRE_TEXT = PREFIX+"text"; //$NON-NLS-1$

-

-	// Help context ids

-	public static final String EDITOR_ACTION1_CONTEXT = PREFIX+"editor_action1_context"; //$NON-NLS-1$

-	public static final String EDITOR_ACTION2_CONTEXT = PREFIX+"editor_action2_context"; //$NON-NLS-1$

-	public static final String EDITOR_ACTION3_CONTEXT = PREFIX+"editor_action3_context"; //$NON-NLS-1$

-	public static final String SECTIONS_VIEW_CONTEXT = PREFIX+"sections_view_context"; //$NON-NLS-1$

-	public static final String PREFERENCE_PAGE_CONTEXT = PREFIX+"preference_page_context"; //$NON-NLS-1$

-	public static final String PROPERTY_PAGE_CONTEXT = PREFIX+"property_page_context"; //$NON-NLS-1$

-	public static final String PROPERTY_PAGE2_CONTEXT = PREFIX+"property_page2_context"; //$NON-NLS-1$

-	public static final String EDITOR_CONTEXT = PREFIX+"editor_context"; //$NON-NLS-1$

-	public static final String SECTIONS_DIALOG_CONTEXT = PREFIX+"sections_dialog_context"; //$NON-NLS-1$

-	public static final String CONTENT_OUTLINE_PAGE_CONTEXT = PREFIX+"content_outline_page_context"; //$NON-NLS-1$

-	public static final String CREATION_WIZARD_PAGE_CONTEXT = PREFIX+"creation_wizard_page_context"; //$NON-NLS-1$

-

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeFileParser.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeFileParser.java
deleted file mode 100644
index 3f51c06..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/IReadmeFileParser.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

-

-/**

- * This interface is used as API for the Readme parser extension 

- * point. The default implementation simply looks for lines

- * in the file that start with a number and assumes that they

- * represent sections. Tools are allowed to replace this 

- * algorithm by defining an extension and supplying an 

- * alternative that implements this interface.

- */

-public interface IReadmeFileParser {

-/**

- * Parses the contents of the provided file

- * and generates a collection of sections.

- */

-public MarkElement[] parse(IFile readmeFile);

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElement.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElement.java
deleted file mode 100644
index e611e8e..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElement.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

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

-import java.util.Iterator;

-import java.util.Vector;

-

-/**

- * This class represents a marked location in the Readme

- * file text.  

- *

- * TIP: By implementing the <code>IWorkbenchAdapter</code> interface,

- * we can easily add objects of this type to viewers and parts in

- * the workbench.  When a viewer contains <code>IWorkbenchAdapter</code>,

- * the generic <code>WorkbenchContentProvider</code> and

- * <code>WorkbenchLabelProvider</code> can be used to provide

- * navigation and display for that viewer.

- */

-public class MarkElement implements IWorkbenchAdapter,IAdaptable {

-	private String headingName;

-	private IAdaptable parent;

-	private int offset;

-	private int numberOfLines;

-	private int length;

-	private Vector children;

-/**

- * Creates a new MarkElement and stores parent element and

- * location in the text.

- *

- * @param parent  the parent of this element

- * @param heading text corresponding to the heading

- * @param offset  the offset into the Readme text

- * @param length  the length of the element

- */

-public MarkElement(IAdaptable parent, String heading, int offset, int length) {

-	this.parent = parent;

-	if (parent instanceof MarkElement) {

-		((MarkElement)parent).addChild(this);

-	}

-	this.headingName = heading;

-	this.offset = offset;

-	this.length = length;

-}

-/**

- * Adds a child to this element

- */

-private void addChild(MarkElement child) {

-	if (children == null) {

-		children = new Vector();

-	}

-	children.add(child);

-}

-/* (non-Javadoc)

- * Method declared on IAdaptable

- */

-public Object getAdapter(Class adapter) {

-	if (adapter == IWorkbenchAdapter.class)

-		return this;

-	if (adapter == IPropertySource.class)

-		return new MarkElementProperties(this);

-	return null;

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public Object[] getChildren(Object object) {

-	if (children != null) {

-		return children.toArray();

-	}

-	return new Object[0];

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public ImageDescriptor getImageDescriptor(Object object) {

-	IWorkbenchAdapter parentElement = (IWorkbenchAdapter)parent.getAdapter(IWorkbenchAdapter.class);

-	if (parentElement != null) {

-		return parentElement.getImageDescriptor(object);

-	}

-	return null;

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public String getLabel(Object o) {

-	return headingName;

-}

-/**

- * Returns the number of characters in this section.

- */

-public int getLength() {

-	return length;

-}

-/**

- * Returns the number of lines in the element.

- *

- * @return the number of lines in the element

- */

-public int getNumberOfLines() {

-	return numberOfLines;

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchAdapter

- */

-public Object getParent(Object o) {

-	return null;

-}

-/**

- * Returns the offset of this section in the file.

- */

-public int getStart() {

-	return offset;

-}

-/**

- * Sets the number of lines in the element

- *

- * @param newNumberOfLines  the number of lines in the element

- */

-public void setNumberOfLines(int newNumberOfLines) {

-	numberOfLines = newNumberOfLines;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElementProperties.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElementProperties.java
deleted file mode 100644
index 7120ae8..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MarkElementProperties.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

-import java.util.List;

-import java.util.Vector;

-

-/**

- * This class encapsulates property sheet properties

- * for MarkElement.  This will display properties for

- * the MarkElement when selected in the readme editor's

- * content outline.

- */

-public class MarkElementProperties implements IPropertySource {

-	protected MarkElement element;

-

-	protected static final String PROPERTY_LINECOUNT = "lineno"; //$NON-NLS-1$

-	protected static final String PROPERTY_START = "start"; //$NON-NLS-1$

-	protected static final String PROPERTY_LENGTH = "length"; //$NON-NLS-1$

-/**

- * Creates a new MarkElementProperties.

- *

- * @param element  the element whose properties this instance represents

- */

-public MarkElementProperties(MarkElement element) {

-	super();

-	this.element = element;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getEditableValue() {

-	return this;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	// Create the property vector.

-	IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[3];

-

-	// Add each property supported.

-	PropertyDescriptor descriptor;

-

-	descriptor = new PropertyDescriptor(PROPERTY_LINECOUNT, MessageUtil.getString("Line_count")); //$NON-NLS-1$

-	propertyDescriptors[0] = descriptor;

-	descriptor = new PropertyDescriptor(PROPERTY_START, MessageUtil.getString("Title_start")); //$NON-NLS-1$

-	propertyDescriptors[1] = descriptor;

-	descriptor = new PropertyDescriptor(PROPERTY_LENGTH, MessageUtil.getString("Title_length")); //$NON-NLS-1$

-	propertyDescriptors[2] = descriptor;

-

-	// Return it.

-	return propertyDescriptors;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public Object getPropertyValue(Object name) {

-	if (name.equals(PROPERTY_LINECOUNT))

-		return new Integer(element.getNumberOfLines());

-	if (name.equals(PROPERTY_START))

-		return new Integer(element.getStart());

-	if (name.equals(PROPERTY_LENGTH))

-		return new Integer(element.getLength());

-	return null;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public boolean isPropertySet(Object property) {

-	return false;

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void resetPropertyValue(Object property) {

-}

-/* (non-Javadoc)

- * Method declared on IPropertySource

- */

-public void setPropertyValue(Object name, Object value) {

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MessageUtil.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MessageUtil.java
deleted file mode 100644
index 75d1815..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/MessageUtil.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.ui.examples.readmetool;

-

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-/**

- * Utility class which helps with managing messages.

- */

-/* package */ class MessageUtil {

-

-	private static final String RESOURCE_BUNDLE= "org.eclipse.ui.examples.readmetool.messages";//$NON-NLS-1$

-

-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-	private MessageUtil() {

-		// prevent instantiation of class

-	}

-

-	/**

-	 * Returns the formatted message for the given key in

-	 * the resource bundle. 

-	 *

-	 * @param key the resource name

-	 * @param args the message arguments

-	 * @return the string

-	 */	

-	public static String format(String key, Object[] args) {

-		return MessageFormat.format(getString(key),args);

-	}

-

-	/**

-	 * Returns the resource object with the given key in

-	 * the resource bundle. If there isn't any value under

-	 * the given key, the key is returned, surrounded by '!'s.

-	 *

-	 * @param key the resource name

-	 * @return the string

-	 */	

-	public static String getString(String key) {

-		try {

-			return fgResourceBundle.getString(key);

-		} catch (MissingResourceException e) {

-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$

-		}

-	}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/PopupMenuActionDelegate.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/PopupMenuActionDelegate.java
deleted file mode 100644
index d9e53d1..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/PopupMenuActionDelegate.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IWorkbenchPart;

- 

-/**

- * Action delegate for handling popup menu actions on a readme file.

- */

-public class PopupMenuActionDelegate implements IObjectActionDelegate {

-

-	private IWorkbenchPart part;

-/** (non-Javadoc)

- * Method declared on IDropActionDelegate

- */

-public void run(IAction action) {

-	MessageDialog.openInformation(

-		this.part.getSite().getShell(),

-		MessageUtil.getString("Readme_Example"), //$NON-NLS-1$

-		MessageUtil.getString("Popup_Menu_Action_executed")); //$NON-NLS-1$

-}

-/** (non-Javadoc)

- * Method declared on IActionDelegate

- */

-public void selectionChanged(IAction action, ISelection selection) {

-	//Ignored for this example

-}

-/** (non-Javadoc)

- * Method declared on IObjectActionDelegate

- */

-public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-	this.part = targetPart;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlineDragListener.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlineDragListener.java
deleted file mode 100644
index fbd6b46..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlineDragListener.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

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

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

-

-/**

- * A drag listener for the readme editor's content outline page.

- * Allows dragging of content segments into views that support

- * the <code>TextTransfer</code> or <code>PluginTransfer</code> transfer types.

- */

-public class ReadmeContentOutlineDragListener extends DragSourceAdapter {

-	private ReadmeContentOutlinePage page;

-/**

- * Creates a new drag listener for the given page.

- */

-public ReadmeContentOutlineDragListener(ReadmeContentOutlinePage page) {

-	this.page = page;

-}

-/* (non-Javadoc)

- * Method declared on DragSourceListener

- */

-public void dragSetData(DragSourceEvent event) {

-	if (PluginTransfer.getInstance().isSupportedType(event.dataType)) {

-		byte[] segmentData = getSegmentText().getBytes();

-		event.data = new PluginTransferData(ReadmeDropActionDelegate.ID, segmentData);

-		return;

-	}

-	if (TextTransfer.getInstance().isSupportedType(event.dataType)) {

-		event.data = getSegmentText();

-		return;

-	}

-}

-/**

- * Returns the text of the currently selected readme segment.

- */

-private String getSegmentText() {

-	StringBuffer result = new StringBuffer();

-	ISelection selection = page.getSelection();

-	if (selection instanceof org.eclipse.jface.viewers.IStructuredSelection) {

-		Object[] selected = ((IStructuredSelection) selection).toArray();

-		result.append("\n"); //$NON-NLS-1$

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

-			if (selected[i] instanceof MarkElement) {

-				result.append(((MarkElement) selected[i]).getLabel(selected[i]));

-				result.append("\n"); //$NON-NLS-1$

-			}

-		}

-	}

-	return result.toString();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlinePage.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlinePage.java
deleted file mode 100644
index 4cc9ff4..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeContentOutlinePage.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

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

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

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

-import org.eclipse.ui.IWorkbenchActionConstants;

-import org.eclipse.ui.help.WorkbenchHelp;

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

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

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

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

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

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

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

-

-/**

- * Content outline page for the readme editor.

- */

-public class ReadmeContentOutlinePage extends ContentOutlinePage {

-	protected IFile input;

-/**

- * Creates a new ReadmeContentOutlinePage.

- */

-public ReadmeContentOutlinePage(IFile input) {

-	super();

-	this.input = input;

-}

-/**  

- * Creates the control and registers the popup menu for this page

- * Menu id "org.eclipse.ui.examples.readmetool.outline"

- */

-public void createControl(Composite parent) {

-	super.createControl(parent);

-

-	WorkbenchHelp.setHelp(getControl(), new String[] {IReadmeConstants.CONTENT_OUTLINE_PAGE_CONTEXT});

-

-	TreeViewer viewer = getTreeViewer();

-	viewer.setContentProvider(new WorkbenchContentProvider());

-	viewer.setLabelProvider(new WorkbenchLabelProvider());

-	viewer.setInput(getContentOutline(input));

-	initDragAndDrop();

-	

-	// Configure the context menu.

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

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

-	menuMgr.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));	 //$NON-NLS-1$

-

-	Menu menu = menuMgr.createContextMenu(viewer.getTree());

-	viewer.getTree().setMenu(menu);

-	// Be sure to register it so that other plug-ins can add actions.

-	getSite().registerContextMenu("org.eclipse.ui.examples.readmetool.outline", menuMgr, viewer);  //$NON-NLS-1$

-}

-/**

- * Gets the content outline for a given input element.

- * Returns the outline (a list of MarkElements), or null

- * if the outline could not be generated.

- */

-private IAdaptable getContentOutline(IAdaptable input) {

-	return ReadmeModelFactory.getInstance().getContentOutline(input);

-}

-/**

- * Initializes drag and drop for this content outline page.

- */

-private void initDragAndDrop() {

-	int ops = DND.DROP_COPY | DND.DROP_MOVE;

-	Transfer[] transfers = new Transfer[] {TextTransfer.getInstance(), PluginTransfer.getInstance()};

-	getTreeViewer().addDragSupport(ops, transfers, new ReadmeContentOutlineDragListener(this));

-}

-/**

- * Forces the page to update its contents.

- *

- * @see ReadmeEditor#doSave(IProgressMonitor)

- */

-public void update() {

-	getControl().setRedraw(false);

-	getTreeViewer().setInput(getContentOutline(input));

-	getTreeViewer().expandAll();

-	getControl().setRedraw(true);

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationPage.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationPage.java
deleted file mode 100644
index 2c2525f..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationPage.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

-import org.eclipse.ui.*;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.help.WorkbenchHelp;

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

-import org.eclipse.swt.*;

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

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

-import java.io.*;

-

-/**

- * This class is the only page of the Readme file resource creation wizard.  

- * It subclasses the standard file resource creation page class, 

- * and consequently inherits the file resource creation functionality.

- *

- * This page provides users with the choice of creating sample headings for

- * sections and subsections.  Additionally, the option is presented to open

- * the file immediately for editing after creation.

- */

-public class ReadmeCreationPage extends WizardNewFileCreationPage {

-	private IWorkbench	workbench;

-	

-	// widgets

-	private Button  sectionCheckbox;

-	private Button  subsectionCheckbox;

-	private Button  openFileCheckbox;

-

-	// constants

-	private static int nameCounter = 1;

-/**

- * Creates the page for the readme creation wizard.

- *

- * @param workbench  the workbench on which the page should be created

- * @param selection  the current selection

- */

-public ReadmeCreationPage(IWorkbench workbench, IStructuredSelection selection) {

-	super("sampleCreateReadmePage1", selection); //$NON-NLS-1$

-	this.setTitle(MessageUtil.getString("Create_Readme_File")); //$NON-NLS-1$

-	this.setDescription(MessageUtil.getString("Create_a_new_Readme_file_resource")); //$NON-NLS-1$

-	this.workbench = workbench;

-}

-/** (non-Javadoc)

- * Method declared on IDialogPage.

- */

-public void createControl(Composite parent) {

-	// inherit default container and name specification widgets

-	super.createControl(parent);

-	Composite composite = (Composite)getControl();

-	

-	WorkbenchHelp.setHelp(composite, new String[] {IReadmeConstants.CREATION_WIZARD_PAGE_CONTEXT});

-	

-	GridData data = (GridData)composite.getLayoutData();

-	this.setFileName("sample" + nameCounter + ".readme"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	new Label(composite,SWT.NONE);	// vertical spacer

-

-	// sample section generation group

-	Group group = new Group(composite,SWT.NONE);

-	group.setLayout(new GridLayout());

-	group.setText(MessageUtil.getString("Automatic_sample_section_generation")); //$NON-NLS-1$

-	group.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));

-

-	// sample section generation checkboxes

-	sectionCheckbox = new Button(group,SWT.CHECK);

-	sectionCheckbox.setText(MessageUtil.getString("Generate_sample_section_titles")); //$NON-NLS-1$

-	sectionCheckbox.setSelection(true);

-	sectionCheckbox.addListener(SWT.Selection,this);

-	

-	subsectionCheckbox = new Button(group,SWT.CHECK);

-	subsectionCheckbox.setText(MessageUtil.getString("Generate_sample_subsection_titles")); //$NON-NLS-1$

-	subsectionCheckbox.setSelection(true);

-	subsectionCheckbox.addListener(SWT.Selection,this);

-

-	new Label(composite,SWT.NONE);	// vertical spacer

-

-	// open file for editing checkbox

-	openFileCheckbox = new Button(composite,SWT.CHECK);

-	openFileCheckbox.setText(MessageUtil.getString("Open_file_for_editing_when_done")); //$NON-NLS-1$

-	openFileCheckbox.setSelection(true);

-

-	setPageComplete(validatePage());

-	

-}

-/**

- * Creates a new file resource as requested by the user. If everything

- * is OK then answer true. If not, false will cause the dialog

- * to stay open.

- *

- * @return whether creation was successful

- * @see ReadmeCreationWizard#performFinish()

- */

-public boolean finish() {

-	// create the new file resource

-	IFile newFile = createNewFile();

-	if (newFile == null)

-		return false;	// ie.- creation was unsuccessful

-

-	// Since the file resource was created fine, open it for editing

-	// if requested by the user

-	try {

-	if (openFileCheckbox.getSelection()) {

-		IWorkbenchWindow dwindow = workbench.getActiveWorkbenchWindow();

-		IWorkbenchPage page = dwindow.getActivePage();

-		if (page != null)

-			page.openEditor(newFile);

-	}

-	} catch (PartInitException e) {

-		e.printStackTrace();

-		return false;

-	}

-	nameCounter++;

-	return true;

-}

-/** 

- * The <code>ReadmeCreationPage</code> implementation of this

- * <code>WizardNewFileCreationPage</code> method 

- * generates sample headings for sections and subsections in the

- * newly-created Readme file according to the selections of self's

- * checkbox widgets

- */

-protected InputStream getInitialContents() {

-	if (!sectionCheckbox.getSelection())

-		return null;

-

-	StringBuffer sb = new StringBuffer();

-	sb.append(MessageUtil.getString("SAMPLE_README_FILE")); //$NON-NLS-1$

-	sb.append(MessageUtil.getString("SECTION_1")); //$NON-NLS-1$

-	sb.append(MessageUtil.getString("SECTION_1_BODY_1")); //$NON-NLS-1$

-	

-	if (subsectionCheckbox.getSelection()) {

-		sb.append(MessageUtil.getString("Subsection_1_1")); //$NON-NLS-1$

-		sb.append(MessageUtil.getString("Subsection_1_1_Body_1")); //$NON-NLS-1$

-	}

-	

-	sb.append(MessageUtil.getString("SECTION_2")); //$NON-NLS-1$

-	sb.append(MessageUtil.getString("SECTION_2_BODY_1")); //$NON-NLS-1$

-	sb.append(MessageUtil.getString("SECTION_2_BODY_2")); //$NON-NLS-1$

-	

-	if (subsectionCheckbox.getSelection()) {

-		sb.append(MessageUtil.getString("Subsection_2_1")); //$NON-NLS-1$

-		sb.append(MessageUtil.getString("Subsection_2_1_BODY_1")); //$NON-NLS-1$

-		sb.append(MessageUtil.getString("Subsection_2_2")); //$NON-NLS-1$

-		sb.append(MessageUtil.getString("Subsection_2_2_BODY_1")); //$NON-NLS-1$

-	}

-	

-	return new ByteArrayInputStream(sb.toString().getBytes());

-}

-/** (non-Javadoc)

- * Method declared on WizardNewFileCreationPage.

- */

-protected String getNewFileLabel() {

-	return MessageUtil.getString("Readme_file_name"); //$NON-NLS-1$

-}

-/** (non-Javadoc)

- * Method declared on WizardNewFileCreationPage.

- */

-public void handleEvent(Event e) {

-	Widget source = e.widget;

-

-	if (source == sectionCheckbox) {

-		if (!sectionCheckbox.getSelection())

-			subsectionCheckbox.setSelection(false);

-		subsectionCheckbox.setEnabled(sectionCheckbox.getSelection());

-	}

-	

-	super.handleEvent(e);

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationWizard.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationWizard.java
deleted file mode 100644
index d06fa2a..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeCreationWizard.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import org.eclipse.ui.*;

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

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

-import org.eclipse.jface.wizard.Wizard;

-

-/**

- * This class implements the interface required by the desktop

- * for all 'New' wizards.  This wizard creates readme files.

- */

-public class ReadmeCreationWizard extends Wizard implements INewWizard {

-	private IStructuredSelection selection;

-	private IWorkbench workbench;

-	private ReadmeCreationPage mainPage;

-/** (non-Javadoc)

- * Method declared on Wizard.

- */

-public void addPages() {

-	mainPage = new ReadmeCreationPage(workbench, selection);

-	addPage(mainPage);

-}

-/** (non-Javadoc)

- * Method declared on INewWizard

- */

-public void init(IWorkbench workbench,IStructuredSelection selection) {

-	this.workbench = workbench;

-	this.selection = selection;

-	setWindowTitle(MessageUtil.getString("New_Readme_File")); //$NON-NLS-1$

-	setDefaultPageImageDescriptor(ReadmeImages.README_WIZARD_BANNER);

-}

-/** (non-Javadoc)

- * Method declared on IWizard

- */

-public boolean performFinish() {

-	return mainPage.finish();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeDropActionDelegate.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeDropActionDelegate.java
deleted file mode 100644
index 0919590..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeDropActionDelegate.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-import java.io.ByteArrayInputStream;

-

-/**

- * Adapter for handling the dropping of readme segments into

- * another plugin.  In this case, we expect the segments

- * to be dropped onto <code>IFile</code> object, or an adapter 

- * that supports <code>IFile</code>.

- */

-public class ReadmeDropActionDelegate implements IDropActionDelegate {

-	public static final String ID = "org_eclipse_ui_examples_readmetool_drop_actions"; //$NON-NLS-1$

-/** (non-Javadoc)

- * Method declared on IDropActionDelegate

- */

-public boolean run(Object source, Object target) {

-	if (source instanceof byte[] && target instanceof IFile) {

-		IFile file = (IFile)target;

-		try {

-			file.appendContents(new ByteArrayInputStream((byte[])source), false, true, null);

-		} catch (CoreException e) {

-			System.out.println(MessageUtil.getString("Exception_in_readme_drop_adapter") + e.getStatus().getMessage()); //$NON-NLS-1$

-			return false;

-		}

-		return true;

-	}

-	return false;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditor.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditor.java
deleted file mode 100644
index 3fa6b18..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IFileEditorInput;

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

-import org.eclipse.ui.editors.text.TextEditor;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

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

-

-/**

- * This class implements the Readme editor.  Since the readme

- * editor is mostly just a text editor, there is very little

- * implemented in this actual class.  It can be regarded as

- * simply decorating the text editor with a content outline.

- */

-public class ReadmeEditor extends TextEditor {

-	protected ReadmeContentOutlinePage page;

-/**

- * Creates a new ReadmeEditor.

- */

-public ReadmeEditor() {

-	super();

-}

-/** (non-Javadoc)

- * Method declared on IEditorPart

- */

-public void doSave(IProgressMonitor monitor) {

-	super.doSave(monitor);

-	if (page != null)

-		page.update();

-}

-/** (non-Javadoc)

- * Method declared on IAdaptable

- */

-public Object getAdapter(Class key) {

-	if (key.equals(IContentOutlinePage.class)) {

-		IEditorInput input = getEditorInput();

-		if (input instanceof IFileEditorInput) {

-			page = new ReadmeContentOutlinePage(((IFileEditorInput)input).getFile());

-			return page;

-		}

-	}

-	return super.getAdapter(key);

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditorActionBarContributor.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditorActionBarContributor.java
deleted file mode 100644
index 8aaae5a..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeEditorActionBarContributor.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

-import org.eclipse.ui.*;

-import org.eclipse.ui.help.WorkbenchHelp;

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

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

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

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

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

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

-import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;

-

-/**

- * This class demonstrates action contribution for the readme editor.

- * A number of menu, toolbar, and status line contributions are defined

- * in the workbench window.  These actions are shared among all 

- * readme editors, and are only visible when a readme editor is 

- * active.  Otherwise, they are invisible.

- */

-public class ReadmeEditorActionBarContributor extends BasicTextEditorActionContributor 

-{

-	private EditorAction action1;

-	private EditorAction action2;

-	private EditorAction action3;

-	private DirtyStateContribution dirtyStateContribution;

-	

-	class EditorAction extends Action {

-		private Shell shell;

-		private IEditorPart activeEditor;

-		public EditorAction(String label) {

-			super(label);

-		}

-		public void setShell(Shell shell) {

-			this.shell = shell;

-		}

-		public void run() {

-			String editorName = MessageUtil.getString("Empty_Editor_Name"); //$NON-NLS-1$

-			if (activeEditor != null)

-				editorName = activeEditor.getTitle();

-			MessageDialog.openInformation(shell,

-				MessageUtil.getString("Readme_Editor"),  //$NON-NLS-1$

-				MessageUtil.format("ReadmeEditorActionExecuted", new Object[] {getText(), editorName})); //$NON-NLS-1$

-		}

-		public void setActiveEditor(IEditorPart part) {

-			activeEditor = part;

-		}

-	}

-/**

- * Creates a new ReadmeEditorActionBarContributor.

- */

-public ReadmeEditorActionBarContributor() {

-	ImageRegistry registry = ReadmePlugin.getDefault().getImageRegistry();

-	action1 = new EditorAction(MessageUtil.getString("Editor_Action1")); //$NON-NLS-1$

-	action1.setToolTipText(MessageUtil.getString("Readme_Editor_Action1")); //$NON-NLS-1$

-	action1.setDisabledImageDescriptor(ReadmeImages.EDITOR_ACTION1_IMAGE_DISABLE);

-	action1.setImageDescriptor(ReadmeImages.EDITOR_ACTION1_IMAGE_ENABLE);

-	action1.setHoverImageDescriptor(ReadmeImages.EDITOR_ACTION1_IMAGE);

-	WorkbenchHelp.setHelp(action1, new String[] {IReadmeConstants.EDITOR_ACTION1_CONTEXT});

-	

-	action2 = new EditorAction(MessageUtil.getString("Editor_Action2")); //$NON-NLS-1$

-	action2.setToolTipText(MessageUtil.getString("Readme_Editor_Action2")); //$NON-NLS-1$

-	action2.setDisabledImageDescriptor(ReadmeImages.EDITOR_ACTION2_IMAGE_DISABLE);

-	action2.setImageDescriptor(ReadmeImages.EDITOR_ACTION2_IMAGE_ENABLE);

-	action2.setHoverImageDescriptor(ReadmeImages.EDITOR_ACTION2_IMAGE);

-	WorkbenchHelp.setHelp(action2, new String[] {IReadmeConstants.EDITOR_ACTION2_CONTEXT});

-	

-	action3 = new EditorAction(MessageUtil.getString("Editor_Action3")); //$NON-NLS-1$

-	action3.setToolTipText(MessageUtil.getString("Readme_Editor_Action3")); //$NON-NLS-1$

-	action3.setDisabledImageDescriptor(ReadmeImages.EDITOR_ACTION3_IMAGE_DISABLE);

-	action3.setImageDescriptor(ReadmeImages.EDITOR_ACTION3_IMAGE_ENABLE);

-	action3.setHoverImageDescriptor(ReadmeImages.EDITOR_ACTION3_IMAGE);

-	WorkbenchHelp.setHelp(action3, new String[] {IReadmeConstants.EDITOR_ACTION3_CONTEXT});

-

-	dirtyStateContribution = new DirtyStateContribution();

-}

-/** (non-Javadoc)

- * Method declared on EditorActionBarContributor

- */

-public void contributeToMenu(IMenuManager menuManager) {

-	// Run super.

-	super.contributeToMenu(menuManager);

-	

-	// Editor-specitic menu

-	MenuManager readmeMenu = new MenuManager(MessageUtil.getString("Readme_Menu")); //$NON-NLS-1$

-	// It is important to append the menu to the

-	// group "additions". This group is created

-	// between "Project" and "Tools" menus

-	// for this purpose.

-	menuManager.insertAfter("additions", readmeMenu); //$NON-NLS-1$

-	readmeMenu.add(action1);

-	readmeMenu.add(action2);

-	readmeMenu.add(action3);

-}

-/** (non-Javadoc)

- * Method declared on EditorActionBarContributor

- */

-public void contributeToStatusLine(IStatusLineManager statusLineManager) {

-	// Run super.

-	super.contributeToStatusLine(statusLineManager);

-

-	// Test status line.	

-	statusLineManager.setMessage(MessageUtil.getString("Editor_is_active")); //$NON-NLS-1$

-	statusLineManager.add(dirtyStateContribution);

-}

-/** (non-Javadoc)

- * Method declared on EditorActionBarContributor

- */

-public void contributeToToolBar(IToolBarManager toolBarManager) {

-	// Run super.

-	super.contributeToToolBar(toolBarManager);

-	

-	// Add toolbar stuff.

-	toolBarManager.add(new Separator("ReadmeEditor")); //$NON-NLS-1$

-	toolBarManager.add(action1);

-	toolBarManager.add(action2);

-	toolBarManager.add(action3);

-}

-/** (non-Javadoc)

- * Method declared on IEditorActionBarContributor

- */

-public void setActiveEditor(IEditorPart editor) {

-	// Run super.

-	super.setActiveEditor(editor);

-

-	// Retarget shared actions to new editor.

-	action1.setActiveEditor(editor);

-	action2.setActiveEditor(editor);

-	action3.setActiveEditor(editor);

-	dirtyStateContribution.editorChanged(editor);

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage.java
deleted file mode 100644
index 043d4cc..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-import org.eclipse.ui.dialogs.PropertyPage;

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

-import org.eclipse.swt.*;

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

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

-import java.io.*;

-

-/**

- * This page will be added to the property page dialog

- * when the "Properties..." popup menu item is selected

- * for Readme files. 

- */

-public class ReadmeFilePropertyPage extends PropertyPage {

-

-/**

- * Utility method that creates a new composite and

- * sets up its layout data.

- *

- * @param parent  the parent of the composite

- * @param numColumns  the number of columns in the new composite

- * @return the newly-created composite

- */

-protected Composite createComposite(Composite parent, int numColumns) {

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

-	GridLayout layout = new GridLayout();

-	layout.numColumns = numColumns;

-	composite.setLayout(layout);

-	GridData data = new GridData();

-	data.verticalAlignment = GridData.FILL;

-	data.horizontalAlignment = GridData.FILL;

-	composite.setLayoutData(data);

-	return composite;

-}

-/** (non-Javadoc)

- * Method declared on PreferencePage

- */

-public Control createContents(Composite parent) {

-

-	// ensure the page has no special buttons

-	noDefaultAndApplyButton();

-	Composite panel = createComposite(parent, 2);

-

-	WorkbenchHelp.setHelp(panel, new DialogPageContextComputer(this, IReadmeConstants.PROPERTY_PAGE_CONTEXT));

-

-	// layout the page

-

-	IResource resource = (IResource) getElement();

-	IStatus result = null;

-	if (resource.getType() == IResource.FILE) {

-		Label l = createLabel(panel, MessageUtil.getString("File_name")); //$NON-NLS-1$

-		l = createLabel(panel, resource.getName());

-		grabExcessSpace(l);

-

-		//

-		createLabel(panel, MessageUtil.getString("Path")); //$NON-NLS-1$

-		l = createLabel(panel, resource.getFullPath().setDevice(null).toString());

-		grabExcessSpace(l);

-

-		//

-		createLabel(panel, MessageUtil.getString("Size")); //$NON-NLS-1$

-		InputStream contentStream = null;

-		try {

-			IFile file = (IFile) resource;

-			if (!file.isLocal(IResource.DEPTH_ZERO))

-				l = createLabel(panel,MessageUtil.getString("<file_contents_not_local>")); //$NON-NLS-1$

-			else {

-				contentStream = file.getContents();

-				Reader in = new InputStreamReader(contentStream);

-				int chunkSize = contentStream.available();

-				StringBuffer buffer = new StringBuffer(chunkSize);

-				char[] readBuffer = new char[chunkSize];

-				int n = in.read(readBuffer);

-				

-				while (n > 0) {

-					buffer.append(readBuffer);

-					n = in.read(readBuffer);

-				}

-				

-				contentStream.close();

-				l = createLabel(panel, Integer.toString(buffer.length()));

-			}

-		} catch (CoreException e) {

-			result = e.getStatus();

-			String message = result.getMessage();

-			if (message == null)

-				l = createLabel(panel, MessageUtil.getString("<Unknown>")); //$NON-NLS-1$

-			else

-				l = createLabel(panel, message);

-		} catch (IOException e) {

-			l = createLabel(panel, MessageUtil.getString("<Unknown>")); //$NON-NLS-1$

-		} finally {

-			if (contentStream != null) {

-				try {

-					contentStream.close();

-				} catch (IOException e) {

-				}

-			}

-		}

-		grabExcessSpace(l);

-		createLabel(panel, MessageUtil.getString("Number_of_sections")); //$NON-NLS-1$

-		// We will get the sections property and simply

-		// report number of elements found.

-		IAdaptable sections = getSections(resource);

-		if (sections instanceof AdaptableList) {

-			AdaptableList list = (AdaptableList)sections;

-			l = createLabel(panel, String.valueOf(list.size()));

-			grabExcessSpace(l);

-		}

-	}

-

-	//

-	Label l = createLabel(panel, MessageUtil.getString("Additional_information")); //$NON-NLS-1$

-	grabExcessSpace(l);

-	GridData gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	return new Canvas(panel, 0);

-}

-/**

- * Utility method that creates a new label and sets up its layout data.

- *

- * @param parent  the parent of the label

- * @param text  the text of the label

- * @return the newly-created label

- */

-protected Label createLabel(Composite parent, String text) {

-	Label label = new Label(parent, SWT.LEFT);

-	label.setText(text);

-	GridData data = new GridData();

-	data.horizontalAlignment = GridData.FILL;

-	label.setLayoutData(data);

-	return label;

-}

-/**

- * Returns the readme sections for this resource, or null

- * if not applicable (resource is not a readme file).

- */

-private AdaptableList getSections(IAdaptable adaptable) {

-	if (adaptable instanceof IFile)

-		return ReadmeModelFactory.getInstance().getSections((IFile)adaptable);

-	else

-		return null;

-}

-/**

- * Sets this control to grab any excess horizontal space

- * left in the window.

- *

- * @param control  the control for which to grab excess space

- */

-private void grabExcessSpace(Control control) {

-	GridData gd = (GridData) control.getLayoutData();

-	if (gd != null) {

-		gd.grabExcessHorizontalSpace = true;

-	}

-}

-/** (non-Javadoc)

- * Method declared on PreferencePage

- */

-public boolean performOk() {

-	// nothing to do - read-only page

-	return true;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage2.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage2.java
deleted file mode 100644
index 629b087..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeFilePropertyPage2.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

-import org.eclipse.ui.dialogs.PropertyPage;

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

-import org.eclipse.swt.*;

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

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

-import java.io.*;

-

-/**

- * This page will be added to the property page dialog

- * when "Properties..." popup menu item is selected

- * for Readme files. 

- *

- * This page demonstrates conditional property pages which look

- * different depending on the state of the element. In this example,

- * the arbitrary condition chosen is whether the Readme file is

- * greater than 256 bytes in length. If it is smaller than 256 bytes

- * in length, this will be a placeholder page containing 

- * a simple message. If it is 256 bytes or larger, additional 

- * information will be provided. This information is determined at

- * runtime.

- *

- * This class may be reused to implement a conditional property page.

- * The getPageIndex() method tests the condition and returns the

- * index of the page to create. The createPage*() methods are called

- * upon to create the actual pages.

- */

-public class ReadmeFilePropertyPage2 extends PropertyPage {

-

-/**

- * Utility method that creates a new composite and

- * sets up its layout data.

- *

- * @param parent  the parent of the composite

- * @param numColumns  the number of columns in the new composite

- * @return the newly-created composite

- */

-protected Composite createComposite(Composite parent, int numColumns) {

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

-	GridLayout layout = new GridLayout();

-	layout.numColumns = numColumns;

-	composite.setLayout(layout);

-	GridData data = new GridData();

-	data.verticalAlignment = GridData.FILL;

-	data.horizontalAlignment = GridData.FILL;

-	composite.setLayoutData(data);

-	return composite;

-}

-/** (non-Javadoc)

- * Method declared on PreferencePage

- */

-public Control createContents(Composite parent) {

-	// ensure the page has no special buttons

-	noDefaultAndApplyButton();

-	Composite panel = createComposite(parent, 2);

-

-	WorkbenchHelp.setHelp(panel, new DialogPageContextComputer(this, IReadmeConstants.PROPERTY_PAGE2_CONTEXT));

-

-	// layout the page

-	int page = getPageIndex();

-	switch (page) {

-		case 1: 

-			createPageOne(panel);

-			break;

-		case 2: 

-			createPageTwo(panel);

-			break;

-		default:

-	}

-	return new Canvas(panel, 0);

-}

-/**

- * Utility method that creates a new label and sets up

- * its layout data.

- *

- * @param parent  the parent of the label

- * @param text  the text of the label

- * @return the newly-created label

- */

-protected Label createLabel(Composite parent, String text) {

-	Label label = new Label(parent, SWT.LEFT);

-	label.setText(text);

-	GridData data = new GridData();

-	data.horizontalAlignment = GridData.FILL;

-	label.setLayoutData(data);

-	return label;

-}

-/**

- * Creates the first version of the page. This is a placeholder page which

- * notified the user that the page is not available.

- *

- * @param panel  the panel in which to create the page

- */

-protected void createPageOne(Composite panel) {

-	Label l = createLabel(panel, MessageUtil.getString("Additional_Readme_properties_not_available.")); //$NON-NLS-1$

-	GridData gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-	l = createLabel(panel, MessageUtil.getString("This_illustrates_a_property_page_that_is_dynamically_determined")); //$NON-NLS-1$

-	gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-	l = createLabel(panel, MessageUtil.getString("not_to_be_available_based_on_the_state_of_the_object.")); //$NON-NLS-1$

-	gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-}

-/**

- * Creates the second version of the page. This page might contain more information

- * about the file or other information.

- *

- * @param panel  the panel in which to create the page

- */

-protected void createPageTwo(Composite panel) {

-	Label l = createLabel(panel, MessageUtil.getString("The_size_of_the_Readme_file_is_at_least_256_bytes.")); //$NON-NLS-1$

-	GridData gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-	l = createLabel(panel, MessageUtil.getString("Had_it_been_less_than_256_bytes_this_page_would_be_a_placeholder_page.")); //$NON-NLS-1$

-	gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-	l = createLabel(panel, MessageUtil.getString("Additional_information")); //$NON-NLS-1$

-	gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-	l = createLabel(panel, MessageUtil.getString("This_illustrates_a_property_page_that_is_dynamically_determined")); //$NON-NLS-1$

-	gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-	l = createLabel(panel, MessageUtil.getString("to_be_available_based_on_the_state_of_the_object.")); //$NON-NLS-1$

-	gd = (GridData) l.getLayoutData();

-	gd.horizontalSpan = 2;

-	gd.grabExcessHorizontalSpace = true;

-}

-/**

- * Returns which page to display. This implementation

- * answers 1 if the size of the Readme file is less than 256 bytes

- * and 2 otherwise.

- *

- * @return the index of the page to display

- */

-protected int getPageIndex() {

-	IResource resource = (IResource) getElement();

-	

-	if (resource.getType() == IResource.FILE) {

-		InputStream contentStream = null;

-		int length = 0;

-		try {

-			IFile file = (IFile) resource;

-			

-			if (file.isLocal(IResource.DEPTH_ZERO)) {

-				contentStream = file.getContents();

-				Reader in = new InputStreamReader(contentStream);

-				int chunkSize = contentStream.available();

-				StringBuffer buffer = new StringBuffer(chunkSize);

-				char[] readBuffer = new char[chunkSize];

-				int n = in.read(readBuffer);

-				

-				while (n > 0) {

-					buffer.append(readBuffer);

-					n = in.read(readBuffer);

-				}

-				

-				contentStream.close();

-				length = buffer.length();

-			}

-		} catch (CoreException e) {

-			length = 0;

-		} catch (IOException e) {

-		} finally {

-			if (contentStream != null) {

-				try {

-					contentStream.close();

-				} catch (IOException e) {

-				}

-			}

-		}

-		

-		if (length < 256)

-			return 1;

-		else

-			return 2;

-	}

-	

-	return 0;

-}

-/** (non-Javadoc)

- * Method declared on PreferencePage

- */

-public boolean performOk() {

-	// nothing to do - read-only page

-	return true;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeImages.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeImages.java
deleted file mode 100644
index dbd753d..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeImages.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

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

-import java.net.MalformedURLException;

-import java.net.URL;

-/**

- * Convenience class for storing references to image descriptors

- * used by the readme tool.

- */

-public class ReadmeImages {

-	static final URL BASE_URL = ReadmePlugin.getDefault().getDescriptor().getInstallURL();

-	static final ImageDescriptor EDITOR_ACTION1_IMAGE;

-	static final ImageDescriptor EDITOR_ACTION2_IMAGE;

-	static final ImageDescriptor EDITOR_ACTION3_IMAGE;

-	static final ImageDescriptor EDITOR_ACTION1_IMAGE_DISABLE;

-	static final ImageDescriptor EDITOR_ACTION2_IMAGE_DISABLE;

-	static final ImageDescriptor EDITOR_ACTION3_IMAGE_DISABLE;

-	static final ImageDescriptor EDITOR_ACTION1_IMAGE_ENABLE;

-	static final ImageDescriptor EDITOR_ACTION2_IMAGE_ENABLE;

-	static final ImageDescriptor EDITOR_ACTION3_IMAGE_ENABLE;

-	static final ImageDescriptor README_WIZARD_BANNER;

-

-	static {

-		String iconPath;

-		if(Display.getCurrent().getIconDepth() > 4)

-			iconPath = "icons/full/";//$NON-NLS-1$

-		else

-			iconPath = "icons/basic/";//$NON-NLS-1$

-		

-		String prefix = iconPath + "ctool16/"; //$NON-NLS-1$

-		EDITOR_ACTION1_IMAGE = createImageDescriptor(prefix + "action1.gif"); //$NON-NLS-1$

-		EDITOR_ACTION2_IMAGE = createImageDescriptor(prefix + "action2.gif"); //$NON-NLS-1$

-		EDITOR_ACTION3_IMAGE = createImageDescriptor(prefix + "action3.gif"); //$NON-NLS-1$

-

-		prefix = iconPath + "dtool16/"; //$NON-NLS-1$

-		EDITOR_ACTION1_IMAGE_DISABLE = createImageDescriptor(prefix + "action1.gif"); //$NON-NLS-1$

-		EDITOR_ACTION2_IMAGE_DISABLE = createImageDescriptor(prefix + "action2.gif"); //$NON-NLS-1$

-		EDITOR_ACTION3_IMAGE_DISABLE = createImageDescriptor(prefix + "action3.gif"); //$NON-NLS-1$

-		

-		prefix = iconPath + "etool16/"; //$NON-NLS-1$

-		EDITOR_ACTION1_IMAGE_ENABLE = createImageDescriptor(prefix + "action1.gif"); //$NON-NLS-1$

-		EDITOR_ACTION2_IMAGE_ENABLE = createImageDescriptor(prefix + "action2.gif"); //$NON-NLS-1$

-		EDITOR_ACTION3_IMAGE_ENABLE = createImageDescriptor(prefix + "action3.gif"); //$NON-NLS-1$

-		

-		prefix = iconPath + "wizban/"; //$NON-NLS-1$

-		README_WIZARD_BANNER = createImageDescriptor(prefix + "newreadme_wiz.gif"); //$NON-NLS-1$

-	}

-/**

- * Utility method to create an <code>ImageDescriptor</code>

- * from a path to a file.

- */

-private static ImageDescriptor createImageDescriptor(String path) {

-	try {

-		URL url = new URL(BASE_URL, path);

-		return ImageDescriptor.createFromURL(url);

-	} catch (MalformedURLException e) {

-	}

-	return ImageDescriptor.getMissingImageDescriptor();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java
deleted file mode 100644
index 187aa3f..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

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

-import java.util.Enumeration;

-import java.util.Iterator;

-

-/**

- * Creates the sections used in the <code>ContentOutline</code>

- *

- * @see ReadmeContentOutlinePage#getContentOutline(IAdaptable)

- */

-public class ReadmeModelFactory {

-	private static ReadmeModelFactory instance = new ReadmeModelFactory();

-	private boolean registryLoaded = false;

-	IReadmeFileParser parser = null;

-/**

- * Creates a new ReadmeModelFactory.

- */

-private ReadmeModelFactory() {

-}

-/**

- * Adds all mark elements to the list for the subtree rooted

- * at the given mark element.

- */

-protected void addSections(AdaptableList list, MarkElement element) {

-	list.add(element);

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

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

-		addSections(list, (MarkElement) children[i]);

-	}

-}

-/**

- * Returns the content outline for the given Readme file.

- *

- * @param adaptable  the element for which to return the content outline

- * @return the content outline for the argument

- */

-public AdaptableList getContentOutline(IAdaptable adaptable) {

-	return new AdaptableList(getToc((IFile)adaptable));

-}

-/**

- * Returns the singleton readme adapter.

- */

-public static ReadmeModelFactory getInstance() {

-	return instance;

-}

-/**

- * Returns a list of all sections in this readme file.

- *

- * @param file  the file for which to return section heading and subheadings

- * @return A list containing headings and subheadings

- */

-public AdaptableList getSections(IFile file) {

-	MarkElement[] topLevel = getToc(file);

-	AdaptableList list = new AdaptableList();

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

-		addSections(list, topLevel[i]);

-	}

-	return list;

-}

-/**

- * Convenience method.  Looks for a readme file in the selection,

- * and if one is found, returns the sections for it.  Returns null

- * if there is no readme file in the selection.

- */

-public AdaptableList getSections(ISelection sel) {

-	// If sel is not a structured selection just return.

-	if (!(sel instanceof IStructuredSelection))

-		return null;

-	IStructuredSelection structured = (IStructuredSelection)sel;

-		

-	//if the selection is a readme file, get its sections.

-	Object object = structured.getFirstElement();

-	if (object instanceof IFile) {

-		IFile file = (IFile) object;

-		String extension = file.getFileExtension();

-		if (extension != null && extension.equals(IReadmeConstants.EXTENSION)) {

-			return getSections(file);

-		}

-	}

-	

-	//the selected object is not a readme file

-	return null;

-}

-/**

- * Parses the contents of the Readme file by looking for lines 

- * that start with a number.

- *

- * @param file  the file representing the Readme file

- * @return an element collection representing the table of contents

- */

-private MarkElement[] getToc(IFile file) {

-	if (registryLoaded == false) loadParser();

-	return parser.parse(file);

-}

-/**

- * Loads the parser from the registry by searching for

- * extensions that satisfy our published extension point.

- * For the sake of simplicity, we will pick the last extension,

- * allowing tools to override what is used. In a more

- * elaborate tool, all the extensions would be processed.

- */

-private void loadParser() {

-	IPluginRegistry pluginRegistry = Platform.getPluginRegistry();

-	IExtensionPoint point = pluginRegistry.getExtensionPoint(IReadmeConstants.PLUGIN_ID, IReadmeConstants.PP_SECTION_PARSER);

-	if (point != null) {

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

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

-			IExtension currentExtension = extensions[i];

-			// in a real application, we would collection

-			// the entire list and probably expose it

-			// as a drop-down list. For the sake

-			// of simplicity, we will pick the last extension only.

-			if (i == extensions.length - 1) {

-				IConfigurationElement[] configElements = currentExtension.getConfigurationElements();

-				for (int j = 0; j < configElements.length; j++) {

-					IConfigurationElement config = configElements[i];

-					if (config.getName().equals(IReadmeConstants.TAG_PARSER)) {

-						// process the first 'parser' element and stop

-						processParserElement(config);

-						break;

-					}

-				}

-			}

-		}

-	}

-	if (parser == null)

-		parser = new DefaultSectionsParser();

-	registryLoaded = true;

-}

-/**

- * Tries to create the Readme file parser. If an error occurs during

- * the creation of the parser, print an error and set the parser

- * to null.

- *

- * @param element  the element to process

- */

-private void processParserElement(IConfigurationElement element) {

-	try {

-		parser = (IReadmeFileParser)element.createExecutableExtension(IReadmeConstants.ATT_CLASS);

-	} catch (CoreException e) {

-		// since this is an example just write to the console

-		System.out.println(MessageUtil.getString("Unable_to_create_file_parser") + e.getStatus().getMessage()); //$NON-NLS-1$

-		parser = null;

-	}

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePlugin.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePlugin.java
deleted file mode 100644
index 6b1b57b..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePlugin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

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

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

-import org.eclipse.jface.preference.IPreferenceStore;

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

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

-

-/**

- * This is the top-level class of the Readme plugin tool.

- *

- * @see AbstractUIPlugin for additional information on UI plugins

- */

-public class ReadmePlugin extends AbstractUIPlugin {

-	// Default instance of the receiver

-		

-	private static ReadmePlugin inst;

-/**

- * Creates the Readme plugin and caches its default instance

- *

- * @param descriptor  the plugin descriptor which the receiver is made from

- */

-public ReadmePlugin(IPluginDescriptor descriptor) {

-	super(descriptor);

-	if (inst==null) inst = this;

-}

-/**

- * Gets the plugin singleton.

- *

- * @return the default ReadmePlugin instance

- */

-static public ReadmePlugin getDefault() {

-	return inst;

-}

-/** 

- * Sets default preference values. These values will be used

- * until some preferences are actually set using Preference dialog.

- */

-protected void initializeDefaultPreferences(IPreferenceStore store) {

-	// These settings will show up when Preference dialog

-	// opens up for the first time.

-	store.setDefault(IReadmeConstants.PRE_CHECK1, true);

-	store.setDefault(IReadmeConstants.PRE_CHECK2, true);

-	store.setDefault(IReadmeConstants.PRE_CHECK3, false);

-	store.setDefault(IReadmeConstants.PRE_RADIO_CHOICE, 2);

-	store.setDefault(IReadmeConstants.PRE_TEXT, MessageUtil.getString("Default_text")); //$NON-NLS-1$

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePreferencePage.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePreferencePage.java
deleted file mode 100644
index 166906d..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmePreferencePage.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import org.eclipse.ui.*;

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

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

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

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

-import org.eclipse.swt.SWT;

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

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

-

-/**

- * This class implements a sample preference page that is 

- * added to the preference dialog based on the registration.

- */

-public class ReadmePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener, ModifyListener {

-	private Button radioButton1;

-	private Button radioButton2;

-	private Button radioButton3;

-

-	private Button checkBox1;

-	private Button checkBox2;

-	private Button checkBox3;

-

-	private Text textField;

-	

-	private Button pushButton_textField;

-/**

- * Creates an new checkbox instance and sets the default

- * layout data.

- *

- * @param group  the composite in which to create the checkbox

- * @param label  the string to set into the checkbox

- * @return the new checkbox

- */ 

-private Button createCheckBox(Composite group, String label) {

-	Button button = new Button(group, SWT.CHECK | SWT.LEFT);

-	button.setText(label);

-	button.addSelectionListener(this);

-	GridData data = new GridData();

-	button.setLayoutData(data);

-	return button;

-}

-/**

- * Creates composite control and sets the default layout data.

- *

- * @param parent  the parent of the new composite

- * @param numColumns  the number of columns for the new composite

- * @return the newly-created coposite

- */

-private Composite createComposite(Composite parent, int numColumns) {

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

-

-	//GridLayout

-	GridLayout layout = new GridLayout();

-	layout.numColumns = numColumns;

-	composite.setLayout(layout);

-

-	//GridData

-	GridData data = new GridData();

-	data.verticalAlignment = GridData.FILL;

-	data.horizontalAlignment = GridData.FILL;

-	composite.setLayoutData(data);

-	return composite;

-}

-/** (non-Javadoc)

- * Method declared on PreferencePage

- */

-protected Control createContents(Composite parent)

-{

-	WorkbenchHelp.setHelp(parent, new DialogPageContextComputer(this, IReadmeConstants.PREFERENCE_PAGE_CONTEXT));

-	

-	//composite_textField << parent

-	Composite composite_textField = createComposite(parent, 2);

-	Label label_textField = createLabel(composite_textField, MessageUtil.getString("Text_Field"));	 //$NON-NLS-1$

-	textField = createTextField(composite_textField);

-	pushButton_textField = createPushButton(composite_textField, MessageUtil.getString("Change")); //$NON-NLS-1$

-

-	//composite_tab << parent

-	Composite composite_tab = createComposite(parent, 2);

-	Label label1 = createLabel(composite_tab, MessageUtil.getString("Radio_Button_Options")); //$NON-NLS-1$

-

-	//

-	tabForward(composite_tab);

-	//radio button composite << tab composite

-	Composite composite_radioButton = createComposite(composite_tab, 1);

-	radioButton1 = createRadioButton(composite_radioButton, MessageUtil.getString("Radio_button_1")); //$NON-NLS-1$

-	radioButton2 = createRadioButton(composite_radioButton, MessageUtil.getString("Radio_button_2")); //$NON-NLS-1$

-	radioButton3 = createRadioButton(composite_radioButton, MessageUtil.getString("Radio_button_3")); //$NON-NLS-1$

-

-

-	//composite_tab2 << parent

-	Composite composite_tab2 = createComposite(parent, 2);

-	Label label2 = createLabel(composite_tab2, MessageUtil.getString("Check_Box_Options")); //$NON-NLS-1$

-

-	//

-	tabForward(composite_tab2);

-	//composite_checkBox << composite_tab2

-	Composite composite_checkBox = createComposite(composite_tab2, 1);

-	checkBox1 = createCheckBox(composite_checkBox, MessageUtil.getString("Check_box_1")); //$NON-NLS-1$

-	checkBox2 = createCheckBox(composite_checkBox, MessageUtil.getString("Check_box_2")); //$NON-NLS-1$

-	checkBox3 = createCheckBox(composite_checkBox, MessageUtil.getString("Check_box_3")); //$NON-NLS-1$

-

-	initializeValues();

-

-	//font = null;

-	return new Composite(parent, SWT.NULL);

-}

-/**

- * Utility method that creates a label instance

- * and sets the default layout data.

- *

- * @param parent  the parent for the new label

- * @param text  the text for the new label

- * @return the new label

- */

-private Label createLabel(Composite parent, String text) {

-	Label label = new Label(parent, SWT.LEFT);

-	label.setText(text);

-	GridData data = new GridData();

-	data.horizontalSpan = 2;

-	data.horizontalAlignment = GridData.FILL;

-	label.setLayoutData(data);

-	return label;

-}

-/**

- * Utility method that creates a push button instance

- * and sets the default layout data.

- *

- * @param parent  the parent for the new button

- * @param label  the label for the new button

- * @return the newly-created button

- */

-private Button createPushButton(Composite parent, String label) {

-	Button button = new Button(parent, SWT.PUSH);

-	button.setText(label);

-	button.addSelectionListener(this);

-	GridData data = new GridData();

-	data.horizontalAlignment = GridData.FILL;

-	button.setLayoutData(data);

-	return button;

-}

-/**

- * Utility method that creates a radio button instance

- * and sets the default layout data.

- *

- * @param parent  the parent for the new button

- * @param label  the label for the new button

- * @return the newly-created button

- */

-private Button createRadioButton(Composite parent, String label) {

-	Button button = new Button(parent, SWT.RADIO | SWT.LEFT);

-	button.setText(label);

-	button.addSelectionListener(this);

-	GridData data = new GridData();

-	button.setLayoutData(data);

-	return button;

-}

-/**

- * Create a text field specific for this application

- *

- * @param parent  the parent of the new text field

- * @return the new text field

- */

-private Text createTextField(Composite parent) {

-	Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);

-	text.addModifyListener(this);

-	GridData data = new GridData();

-	data.horizontalAlignment = GridData.FILL;

-	data.grabExcessHorizontalSpace = true;

-	data.verticalAlignment = GridData.CENTER;

-	data.grabExcessVerticalSpace = false;

-	text.setLayoutData(data);

-	return text;

-}

-/** 

- * The <code>ReadmePreferencePage</code> implementation of this

- * <code>PreferencePage</code> method 

- * returns preference store that belongs to the our plugin.

- * This is important because we want to store

- * our preferences separately from the desktop.

- */

-protected IPreferenceStore doGetPreferenceStore() {

-	return ReadmePlugin.getDefault().getPreferenceStore();

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchPreferencePage

- */

-public void init(IWorkbench workbench){

-}

-/**

- * Initializes states of the controls using default values

- * in the preference store.

- */

-private void initializeDefaults() {

-	IPreferenceStore store = getPreferenceStore();

-	checkBox1.setSelection(store.getDefaultBoolean(IReadmeConstants.PRE_CHECK1));

-	checkBox2.setSelection(store.getDefaultBoolean(IReadmeConstants.PRE_CHECK2));

-	checkBox3.setSelection(store.getDefaultBoolean(IReadmeConstants.PRE_CHECK3));

-

-	radioButton1.setSelection(false);

-	radioButton2.setSelection(false);

-	radioButton3.setSelection(false);

-	int choice = store.getDefaultInt(IReadmeConstants.PRE_RADIO_CHOICE);

-	switch (choice) {

-		case 1:

-		   radioButton1.setSelection(true);

-		   break;

-		case 2:

-		   radioButton2.setSelection(true);

-		   break;

-		case 3:

-		   radioButton3.setSelection(true);

-		   break;

-	}

-	textField.setText(store.getDefaultString(IReadmeConstants.PRE_TEXT));

-}

-/**

- * Initializes states of the controls from the preference store.

- */

-private void initializeValues() {

-	IPreferenceStore store = getPreferenceStore();

-	checkBox1.setSelection(store.getBoolean(IReadmeConstants.PRE_CHECK1));

-	checkBox2.setSelection(store.getBoolean(IReadmeConstants.PRE_CHECK2));

-	checkBox3.setSelection(store.getBoolean(IReadmeConstants.PRE_CHECK3));

-

-	int choice = store.getInt(IReadmeConstants.PRE_RADIO_CHOICE);

-	switch (choice) {

-		case 1:

-		   radioButton1.setSelection(true);

-		   break;

-		case 2:

-		   radioButton2.setSelection(true);

-		   break;

-		case 3:

-		   radioButton3.setSelection(true);

-		   break;

-	}

-	textField.setText(store.getString(IReadmeConstants.PRE_TEXT));

-}

-/** (non-Javadoc)

- * Method declared on ModifyListener

- */

-public void modifyText(ModifyEvent event) {

-	//Do nothing on a modification in this example

-}

-/* (non-Javadoc)

- * Method declared on PreferencePage

- */

-protected void performDefaults() {

-	super.performDefaults();

-	initializeDefaults();

-}

-/* (non-Javadoc)

- * Method declared on PreferencePage

- */

-public boolean performOk() {

-	storeValues();

-	return true;

-}

-/**

- * Stores the values of the controls back to the preference store.

- */

-private void storeValues() {

-	IPreferenceStore store = getPreferenceStore();

-	store.setValue(IReadmeConstants.PRE_CHECK1, checkBox1.getSelection());

-	store.setValue(IReadmeConstants.PRE_CHECK2, checkBox2.getSelection());

-	store.setValue(IReadmeConstants.PRE_CHECK3, checkBox3.getSelection());

-

-	int choice = 1;

-

-	if (radioButton2.getSelection()) choice = 2;

-	else if (radioButton3.getSelection()) choice = 3;

-

-	store.setValue(IReadmeConstants.PRE_RADIO_CHOICE, choice);

-	store.setValue(IReadmeConstants.PRE_TEXT, textField.getText());

-}

-/**

- * Creates a tab of one horizontal spans.

- *

- * @param parent  the parent in which the tab should be created

- */

-private void tabForward(Composite parent) {

-	Label vfiller = new Label(parent, SWT.LEFT);

-	GridData gridData = new GridData();

-	gridData = new GridData();

-	gridData.horizontalAlignment = GridData.BEGINNING;

-	gridData.grabExcessHorizontalSpace = false;

-	gridData.verticalAlignment = GridData.CENTER;

-	gridData.grabExcessVerticalSpace = false;

-	vfiller.setLayoutData(gridData);

-}

-/** (non-Javadoc)

- * Method declared on SelectionListener

- */

-public void widgetDefaultSelected(SelectionEvent event) {

-	//Handle a default selection. Do nothing in this example

-}

-/** (non-Javadoc)

- * Method declared on SelectionListener

- */

-public void widgetSelected(SelectionEvent event) {

-	//Do nothing on selection in this example;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeSectionsView.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeSectionsView.java
deleted file mode 100644
index db6b204..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeSectionsView.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

-import org.eclipse.ui.*;

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

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

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

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

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

-

-/**

- * This class demonstrates a simple view containing a single viewer.

- */

-public class ReadmeSectionsView extends ViewPart implements ISelectionListener {

-	ListViewer viewer;

-/**

- * Creates a new ReadmeSectionsView .

- */

-public ReadmeSectionsView() {

-	super();

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchPart

- */

-public void createPartControl(Composite parent) {

-	viewer = new ListViewer(parent);

-

-	WorkbenchHelp.setHelp(viewer.getControl(), new ViewContextComputer(this, IReadmeConstants.SECTIONS_VIEW_CONTEXT));

-

-	// if the objects in the viewer implement the IDesktopElement adapter,

-	// these generic content and label providers can be used.

-	viewer.setContentProvider(new WorkbenchContentProvider());

-	viewer.setLabelProvider(new WorkbenchLabelProvider());

-

-	// add myself as a global selection listener

-	getSite().getPage().addSelectionListener(this);

-	

-	// prime the selection

-	selectionChanged(null, getSite().getPage().getSelection());

-}

-/**

- * The <code>ReadmeSectionView</code> implementation of this 

- * <code>IWorkbenchPart</code> method runs super

- * and removes itself from the global selection listener. 

- */

-public void dispose() {

-	super.dispose();

-	getSite().getPage().removeSelectionListener(this);

-}

-/* (non-Javadoc)

- * Method declared on ISelectionListener

- */

-public void selectionChanged(IWorkbenchPart part, ISelection sel) {

-	//if the selection is a readme file, get its sections.

-	AdaptableList input = ReadmeModelFactory.getInstance().getSections(sel);

-	viewer.setInput(input);

-}

-/* (non-Javadoc)

- * Method declared on IWorkbenchPart

- */

-public void setFocus() {

-	viewer.getControl().setFocus();

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/SectionsDialog.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/SectionsDialog.java
deleted file mode 100644
index 40bb7fb..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/SectionsDialog.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

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

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

-import org.eclipse.ui.help.WorkbenchHelp;

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

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

-import org.eclipse.swt.SWT;

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

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

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

-/**

- * This dialog is an example of a detached window launched

- * from an action in the desktop.

- */

-public class SectionsDialog extends Dialog {

-	protected IAdaptable input;

-/**

- * Creates a new SectionsDialog.

- */

-public SectionsDialog(Shell parentShell, IAdaptable input) {

-	super(parentShell);

-	this.input = input;

-}

-/* (non-Javadoc)

- * Method declared on Window.

- */

-protected void configureShell(Shell newShell) {

-	super.configureShell(newShell);

-	newShell.setText(MessageUtil.getString("Readme_Sections")); //$NON-NLS-1$

-	WorkbenchHelp.setHelp(newShell, new String[] {IReadmeConstants.SECTIONS_DIALOG_CONTEXT});

-}

-/* (non-Javadoc)

- * Method declared on Dialog

- */

-protected Control createDialogArea(Composite parent) {

-	Composite composite = (Composite)super.createDialogArea(parent);

-	

-	List list = new List(composite, SWT.BORDER);

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

-	list.setLayoutData(data);

-	ListViewer viewer = new ListViewer(list);

-	viewer.setContentProvider(new WorkbenchContentProvider());

-	viewer.setLabelProvider(new WorkbenchLabelProvider());

-	viewer.setInput(input);

-

-	return composite;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ViewActionDelegate.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ViewActionDelegate.java
deleted file mode 100644
index 12614d0..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ViewActionDelegate.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import org.eclipse.ui.*;

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

-

-/**

- * This class is used to demonstrate view action extensions.

- * An extension should be defined in the readme plugin.xml.

- */

-public class ViewActionDelegate implements IViewActionDelegate {

-	public IViewPart view;

-/**

- * Creates a new ViewActionDelegate.

- */

-public ViewActionDelegate() {

-	super();

-}

-/* (non-Javadoc)

- * Method declared on IViewActionDelegate

- */

-public void init(IViewPart view) {

-	this.view = view;

-}

-/* (non-Javadoc)

- * Method declared on IActionDelegate

- */

-public void run(org.eclipse.jface.action.IAction action) {

-	MessageDialog.openInformation(view.getSite().getShell(),

-		MessageUtil.getString("Readme_Editor"),  //$NON-NLS-1$

-		MessageUtil.getString("View_Action_executed")); //$NON-NLS-1$

-}

-/* (non-Javadoc)

- * Method declared on IActionDelegate

- */

-public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection selection) {}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/WindowActionDelegate.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/WindowActionDelegate.java
deleted file mode 100644
index ec6df81..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/WindowActionDelegate.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.ui.examples.readmetool;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import org.eclipse.ui.*;

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

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

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

-

-/**

- * This class shows how <code>IActionDelegate</code> implementations

- * should be used for global action registration for menu 

- * and tool bars. Action proxy object is created in the 

- * desktop based on presentation information in the plugin.xml

- * file. Delegate is not loaded until the first time the user

- * presses the button or selects the menu. Based on the action

- * availability, it is possible that the button will disable

- * instead of executing.

- */

-public class WindowActionDelegate implements IWorkbenchWindowActionDelegate {

-	private IWorkbenchWindow window;

-	private ISelection selection;

-/* (non-Javadoc)

- * Method declared on IWorkbenchActionDelegate

- */

-public void dispose() {}

-/* (non-Javadoc)

- * Method declared on IWorkbenchActionDelegate

- */

-public void init(IWorkbenchWindow window) {

-	this.window = window;

-}

-/** 

- * The <code>WindowActionDelegate</code> implementation of this

- * <code>IActionDelegate</code> method 

- * launches a stand-alone dialog that contains a list of sections for

- * the selected readme file in the navigator.

- */

-public void run(IAction action) {

-	SectionsDialog dialog = new SectionsDialog(window.getShell(), 

-		ReadmeModelFactory.getInstance().getSections(selection));

-	dialog.open();

-}

-/** 

- * The <code>WindowActionDelegate</code> implementation of this

- * <code>IActionDelegate</code> method 

- * does nothing - we will let simple rules in the XML

- * config file react to selections.

- */

-public void selectionChanged(IAction action, ISelection selection) {

-	this.selection = selection;

-}

-}

diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/messages.properties b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/messages.properties
deleted file mode 100644
index e7d2a14..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/messages.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-Clean=Clean

-Save_Needed=Save Needed

-Editor_Action_executed=Editor Action executed

-Readme_Editor=Readme Editor

-Line_count=Line count

-Title_length=Title length

-Title_start=Title start

-Popup_Menu_Action_executed=Popup Menu Action executed

-Readme_Example=Readme Example

-Automatic_sample_section_generation=Automatic sample section generation

-Create_Readme_File=Create Readme File

-Create_a_new_Readme_file_resource=Create a new Readme file resource.

-Generate_sample_section_titles=Generate sample section titles

-Generate_sample_subsection_titles=Generate sample subsection titles

-Open_file_for_editing_when_done=Open file for editing when done

-Readme_file_name=Readme file name:

-SAMPLE_README_FILE=\n\n     SAMPLE README FILE\n\n

-SECTION_1=1. SECTION 1\n

-SECTION_1_BODY_1=This text is a placeholder for the section body.\n

-SECTION_2=2. SECTION 2\n

-SECTION_2_BODY_1=This text is a placeholder for the section body. It is\n

-SECTION_2_BODY_2=a bit longer in order to span two lines.\n

-Subsection_1_1=\ \ \ 1.1 Subsection\n

-Subsection_1_1_Body_1=\ \ \ This text is a placeholder for the subsection body\n

-Subsection_2_1=\ \ \ 2.1 Subsection\n

-Subsection_2_1_BODY_1=\ \ \ This text is a placeholder for the subsection body\n

-Subsection_2_2=\ \ \ 2.2 Subsection\n

-Subsection_2_2_BODY_1=\ \ \ This text is a placeholder for the subsection body\n

-New_Readme_File=New Readme File

-Exception_in_readme_drop_adapter=Exception in readme drop adapter: 

-Editor_Action1=&Editor Action1

-Editor_Action2=&Editor Action2

-Editor_Action3=&Editor Action3

-Editor_is_active=Editor is active

-Empty_Editor_Name=Empty

-Readme_Editor_Action1=Readme Editor Action1

-Readme_Editor_Action2=Readme Editor Action2

-Readme_Editor_Action3=Readme Editor Action3

-Readme_Menu=&Readme

-ReadmeEditorActionExecuted=Readme Editor Action executed: {0} for: {1}

-<Unknown>=<Unknown>

-<file_contents_not_local>=<file contents not local>

-Additional_information=Additional information about the Readme file can go here.

-File_name=File name:

-Number_of_sections=Number of sections:

-Path=Path: 

-Size=Size: 

-Additional_Readme_properties_not_available.=Additional Readme properties not available.

-Had_it_been_less_than_256_bytes_this_page_would_be_a_placeholder_page.=Had it been less than 256 bytes, this page would be a placeholder page.

-The_size_of_the_Readme_file_is_at_least_256_bytes.=The size of the Readme file is at least 256 bytes.

-This_illustrates_a_property_page_that_is_dynamically_determined=This illustrates a property page that is dynamically determined

-not_to_be_available_based_on_the_state_of_the_object.=not to be available based on the state of the object.

-to_be_available_based_on_the_state_of_the_object.=to be available based on the state of the object.

-Unable_to_create_file_parser=Unable to create file parser.

-Default_text=Default text

-Change=Change

-Check_Box_Options=Check Box Options

-Check_box_1=Check box 1

-Check_box_2=Check box 2

-Check_box_3=Check box 3

-Radio_Button_Options=Radio Button Options

-Radio_button_1=Radio button 1

-Radio_button_2=Radio button 2

-Radio_button_3=Radio button 3

-Text_Field=Text Field

-Readme_Sections=Readme Sections

-View_Action_executed=View Action executed

diff --git a/examples/org.eclipse.ui.examples.readmetool/HelpContexts.xml b/examples/org.eclipse.ui.examples.readmetool/HelpContexts.xml
deleted file mode 100644
index 9cbfd96..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/HelpContexts.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<contexts>

-

-   <context  id="open_browser_action_context" >

-      <description>Opens the readme browser </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-   <context  id="view_action_context" >

-      <description>Runs a readme view action <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-   <context  id="editor_action_context" >

-      <description>Runs a readme editor action <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-   <context  id="editor_action1_context" >

-      <description>Runs readme editor action 1 <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-   <context  id="editor_action2_context" >

-      <description>Runs readme editor action 2 <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-   <context  id="editor_action3_context" >

-      <description>Runs readme editor action 3 <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-

-   <context  id="sections_view_context" >

-      <description>Readme sections view <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-

-   <context  id="sections_dialog_context" >

-      <description>Readme sections dialog <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-

-   <context  id="preference_page_context" >

-      <description>Readme preference page <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-

-   <context  id="property_page_context" >

-      <description>Readme property page <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-   <context  id="property_page2_context" >

-      <description>Readme property page2 <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-

-   <context  id="editor_context" >

-      <description>Readme editor <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-

-   <context  id="content_outline_page_context" >

-      <description>Readme editor content outline <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-

-   <context  id="creation_wizard_page_context" >

-      <description>Readme file creation wizard <b>Help</b> </description>

-      <topic href="contexts/RelatedContext3.html"  label="Help Related Topic 3 - Temporary"/>

-      <topic href="contexts/RelatedContext4.html"  label="Help Related Topic 4 - Temporary"/>

-   </context>

-</contexts>
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.readmetool/about.html b/examples/org.eclipse.ui.examples.readmetool/about.html
deleted file mode 100644
index 9a15e5c..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body>

-<body lang=EN-US link=blue vlink=purple>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">About This Plug-in</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>1st November, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org makes available all content in this plug-in.  The plug-in is provided to you under the terms and conditions of the

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a>.  For purposes of the Common Public License, &quot;Program&quot; will mean the plug-in.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.readmetool/build.properties b/examples/org.eclipse.ui.examples.readmetool/build.properties
deleted file mode 100644
index ee8f254..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.readmetool.jar = Eclipse UI Examples Readme Tool/

-

-bin.includes = doc/,\

-				doc-html/,\

-				icons/,\

-				.options,\

-				about.html,\

-				doc.zip,\

-				HelpContexts.xml,\

-				plugin.properties,\

-				plugin.xml,\

-				*.jar
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.readmetool/doc-html/hglegal.htm b/examples/org.eclipse.ui.examples.readmetool/doc-html/hglegal.htm
deleted file mode 100644
index b071dbd..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc-html/hglegal.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]">

-   <title>Legal Notices</title>

-</head>

-<body>

-

-<h3>

-<a NAME="Notices"></a>Notices</h3>

-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.readmetool/doc-html/ngibmcpy.gif b/examples/org.eclipse.ui.examples.readmetool/doc-html/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc-html/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/doc-html/ui_readmetool_ex.html b/examples/org.eclipse.ui.examples.readmetool/doc-html/ui_readmetool_ex.html
deleted file mode 100644
index a98a144..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc-html/ui_readmetool_ex.html
+++ /dev/null
@@ -1,165 +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>Desktop - Readme Tool Example</title>

-</head>

-<body>

-

-<h2>

-<b>Example - Readme Tool</b></h2>

-

-<h3>

-Introduction</h3>

-The Readme editor shows how to define your own extension points for use

-by other plugins. It also shows how to create extensions for resource popup

-menu entries, new resource wizards, file editors on an extension (.readme),

-a custom view and property pages.

-<h3>

-Running the example</h3>

-To start using this example create a file with the .readme extension using

-the file creation wizard or create one using the example creation wizard.

-The additional&nbsp; view provided by this example can be seen by selecting

-Perspectives > Show View > Other and expanding the Readme section. The

-view action can be seen by clicking on the readme icon on the Navigator

-View.

-<h4>

-Creating a new readme file</h4>

-Create a new file with file extension .readme.&nbsp; From the File menu,

-select New and then select Other... from the sub menu.&nbsp; Click on Simple

-in the wizard, then select File in the list on the left.&nbsp; Click on

-Next to supply the file name (make sure the extension is .readme) and the

-folder in which the file should be contained.

-<h4>

-Example creation wizards</h4>

-From the File menu, select New and from the sub menu select Other...&nbsp;

-Now select Example Creation Wizards. Select Readme File. Click Next. Select

-the folder in which you want the file to be created. Type the name of the

-file with a .readme extension. Click Finish.

-<h4>

-Readme view extension action</h4>

-In the Navigator View, select a file with extension .readme. If there isn't

-one create a file with that extension. On the local toolbar of the Navigator

-View, you will see a button whose hover help says Run Readme View Extension.&nbsp;

-Click on this button.&nbsp; A dialog will popup saying View Action executed.

-<h4>

-Popup menus</h4>

-In the Navigator View, select a file with extension .readme.&nbsp; If there

-isn't one create a file with that extension.&nbsp; Select the file to bring

-up the popup menu.&nbsp; Notice there is a menu item that says Show Readme

-Action in the popup menu.&nbsp; Choose this menu item to open a dialog

-that says Popup Menu Action Executed.

-<h4>

-Preference page</h4>

-From the Window menu, select Preferences.&nbsp; Click on the page called

-Readme Example.&nbsp; This shows an example of a preference page.

-<h4>

-Property page</h4>

-In the Navigator View, select a file with extension .readme.&nbsp; If there

-isn't one create a file with that extension.&nbsp; Select the file to bring

-up the popup menu, then select the Properties menu item.&nbsp; Click on

-the page called Readme Tool to see an example of a property page.

-<h4>

-Readme file editor</h4>

-The Readme File Editor is the default editor for files of type *.readme.&nbsp;

-Create a file with extension .readme and open the file by double clicking

-on it, or by bringing up the popup menu,&nbsp; selecting Open With, then

-selecting Readme File Editor from the sub menu.&nbsp; Notice the editor

-has an icon with a pencil.&nbsp; This is the editor that the readme tool

-uses by default for files of type *.readme.

-<h4>

-Readme Editor Actions</h4>

-This demonstrates an example of actions that are applicable only to a particular

-editor.&nbsp; When a readme file editor has focus, notice 4 additional

-tool bar buttons - Run Readme Editor Extension, Readme Editor Action 1,

-Readme Editor Action 2, Readme Editor Action 3.

-<p>A pull down menu named Readme appears when a readme file editor has

-focus.&nbsp; It contains the actions previously described: Readme Editor

-Action 1, Readme Editor Action 2, Readme Editor Action 3.

-<h4>

-Readme sections view</h4>

-To see this Readme Sections view, from the Perspective menu select Show

-View, then select Other... from the sub menu.&nbsp; Expand the Readme item

-and then select Readme Sections.&nbsp; This will show a list of the sections

-in the current *.readme file when a .readme file is selected in the Navigator

-View.&nbsp; You can also see the structure of a *.readme file in the Outline

-view.

-<p>A file with extension .readme can be broken down into sections when

-each section begins with a number.&nbsp; For example, if the following

-text were entered into the readme file editor, the readme tool would detect

-2 sections.&nbsp; To see how sections are detected in the readme tool,

-type some text in the readme file editor, save the file by either typing

-CTRL-S or selecting&nbsp; File->Save. Open the Readme Sections view and

-select the .readme file in the Navigator View.

-<p>Example text:

-<p>99.1 This is my first section

-<br>This is some text in my first section.

-<p>99.1.1 This is a sub section

-<br>This is some text in my sub-section.

-<h4>Drag and Drop</h4>

-<p>The Drag and Drop functionality can be seen by selecting a section in the

-Outline View and dragging the selection over top of a text file. The contents of

-the selection will be appended to the file.

-<h4>

-Help contribution</h4>

-The readme tool example also demonstrates how to use and implement context

-help on all of the extensions it supplies - a view, various actions and

-a wizard page.&nbsp; To get context help on an action, hover over the menu

-item, but do no select it, then hit the F1 key.&nbsp; You can also get

-context sensitive (F1) help on the Readme Sections view and the Example

-Creation Wizards page (in the New wizard).

-<br>&nbsp;

-<h3>

-Details</h3>

-The Readme Tool example declares one extension point and supplies a number

-of extensions.&nbsp; The extensions supplied are quite comprehensive in

-understanding how the Workbench functions, as it utilizes a number of the

-more interesting extension points declared by the workbench.&nbsp; Supplied

-extensions included in this example are views and view actions, preference

-pages, property pages, wizards, editors and editor actions, popup menus,

-action sets, help contributions, help contexts, and drop actions.

-<p>This example also supplies an extension point declared in the plug-in..

-The class IReadmeFileParser is required for any plug-in that uses the org.eclipse.ui.examples.readmetool.sectionParser

-extension that this example defines. The class DefaultSectionParser is

-an example implementation of IReadmeFileParser.

-<p>The class ReadmeEditor implements IEditorPart and is defined as an editor

-on files with the extension .readme in the plugin.xml using the org.eclipse.ui.editors

-extension point. The class ReadmeSectionsView implements IViewPart and

-is defined as a view using the org.eclipse.ui.views extension point. This

-extension point also defines a category for the view for use in view selection.

-<p>Two types of preference settings are defined in this example, workbench

-preferences and resource properties. The workbench preference is defined

-in class ReadmePreferencePage which implements IWorkbenchPreferencePage

-so that it will be added to the Workbench->Preferences dialog. The class

-is defined in the extension point org.eclipse.ui.preferencePages in the

-plugin.xml. The two resource properties pages are ReadmeFilePropertyPage

-and ReadmeFilePropertyPage2 both of which implement IWorkbenchPropertyPage.

-They are both defined to be invoked on the IFile type by the objectClass

-tag in the plugin.xml in the org.eclipse.ui.propertyPages extension point.

-<p>The class ReadmeCreationWizard implements INewWizard and is defined

-in the org.eclipse.ui.newWizards extension point in the plugin.xml. This

-extension point also defines the category that the wizard that is shown

-when the user selects File->New->Other....

-<p>Several action stubs are added to this example. The action set declares

-a menu labeled Readme File Editor<b> </b>to be included in the workbench

-window menu bar using the extension point org.eclipse.ui.actionSets. It

-also defines an action for the workbench toolbar and menu bar using the

-tags toolbarPath and menubarPath. It uses the class WindowActionDelegate

-which implements IWorkbenchWindowActionDelegate to implement the action.

-The action for the popup menu is defined as an objectContribution by the

-class PopupMenuActionDelegate in&nbsp; the extension point org.eclipse.ui.popupMenus.

-PopupMenuActionDelegate implements IObjectActionDelegate and uses the IWorkbenchPart

-provided to open a message dialog. The view action ViewActionDelegate is

-defined in the extension point org.eclipse.ui.viewActions and implements

-IViewActionDelegate. The View it appears in is defined by the tag targetID

-which in this example is org.eclipse.ui.views.ResourceNavigator. The editor

-action is defined by the class EditorActionDelegate which implements IEditorActionDelegate

-and is added using the org.eclipse.ui.editorActions extension point. The

-editor that it is applied to is defined by the tag targetID which in this

-example is defined on org.eclipse.ui.examples.readmetool.ReadmeEditor.<p>The

-class ReadmeDropActionDelegate implements IDropDelegate. IDropDelegates are

-informed every time there is a drop action performed in the workbench . The

-extension point for this action is org.eclipse.ui.dropActions.

-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.readmetool/doc.zip b/examples/org.eclipse.ui.examples.readmetool/doc.zip
deleted file mode 100644
index 41e8aa9..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc.zip
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/doc/hglegal.htm b/examples/org.eclipse.ui.examples.readmetool/doc/hglegal.htm
deleted file mode 100644
index b071dbd..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc/hglegal.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]">

-   <title>Legal Notices</title>

-</head>

-<body>

-

-<h3>

-<a NAME="Notices"></a>Notices</h3>

-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.readmetool/doc/ngibmcpy.gif b/examples/org.eclipse.ui.examples.readmetool/doc/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool.html b/examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool.html
deleted file mode 100644
index aed1eca..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool.html
+++ /dev/null
@@ -1,28 +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>Readme Tool Extension Points</title>

-</head>

-<body link="#0000FF" vlink="#800080">

-

-<center>

-<h1>

-Readme Tool</h1></center>

-The Readme Tool is provided as an example for tool developers. It demonstrates

-the extension of various aspects of the workbench, both visually and functionally.

-As well, the Readme Tool provides extension points of its own.

-<p>

-<hr WIDTH="100%">

-<h1>

-Extension Points</h1>

-The following extension points can be used to extend the Readme Tool:

-<ul>

-<li>

-<a href="org_eclipse_ui_examples_readmetool_sectionParser.html">org.eclipse.ui.readmetool.sectionParser</a></li>

-</ul>

-

-<p><a href="hglegal.htm"><img src="ngibmcpy.gif" alt="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." width="195" height="12" border="0"></a></p>

-

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool_sectionParser.html b/examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool_sectionParser.html
deleted file mode 100644
index 7c889f6..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/doc/org_eclipse_ui_examples_readmetool_sectionParser.html
+++ /dev/null
@@ -1,65 +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>README Tool Extension Points</title>

-</head>

-<body link="#0000FF" vlink="#800080">

-

-<center>

-<h1>

-Section Parser</h1></center>

-<b><i>Identifier: </i></b>org.eclipse.ui.examples.readmetool.sectionParser

-<p><b><i>Description: </i></b>This extension point allows tools to provide

-a parser for Readme files which identifies the sections of the file.

-The sections determined by this parser will show up in the outliner when a

-Readme file is open in the editor. The sections will also appear in the 

-"Readme sections" view.

-<p>The default section parser provided with the Readme Tool is a simple parser

-which considers sections to be numbered at the beginning of a line. Top-level

-sections are signified by a number followed by a period, such as in the following

-regular expression: "[0-9]+\.". Examples are "1.", "0.", and "12345.".

-Subsections are signified by the regular expression: "([0-9]+\.)+[0-9]+". Examples

-of subsections are "1.1", "1.1.1.1", and "123.456.7890". Any level of subsection

-nesting may occur. Section and subsection markers must occur before any other

-non-whitespace characters on a line.

-<p><b><i>Configuration Markup:</i></b>

-<p><tt>&nbsp;&nbsp; &lt;!ATTLIST sectionParser</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; name &nbsp;CDATA #REQUIRED</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id &nbsp;&nbsp; CDATA #REQUIRED</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class CDATA #REQUIRED</tt>

-<br><tt>&nbsp;&nbsp; ></tt>

-<ul>

-<li>

-<b>name</b> - a string describing this contribution.</li>

-

-<li>

-<b>id</b> - a unique identifier that can be used to reference this extension.</li>

-

-<li>

-<b>class</b> - a fully qualified name of the class which provides this extension.</li>

-</ul>

-

-<b><i>Examples:</i></b>

-<p>The following is an example of a sectionParser extension point:

-<p><tt>&nbsp;&nbsp;&lt;extension point="org.eclipse.ui.examples.readmetool.sectionParser"></tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;parser</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; name="Custom README Section Parser"</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id="com.xyz.CustomSectionParser"</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class="com.xyz.CustomSectionParser"></tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/parser></tt>

-<br><tt>&nbsp;&nbsp;&lt;/extension></tt>

-<p>In the example above, the class com.xyz.CustomSectionParser will be used as

-the section parser for Readme files.

-<p><b><i>API Information: </i></b>Value of the action attribute <b>class</b>

-must be a fully qualified class name of a Java class that implements the interface

-org.eclipse.ui.examples.readmetool.IReadmeFileParser. This interface is loaded as 

-late as possible to avoid loading the entire tool before it is really needed.

-<p><b><i>Supplied Implementation: </i></b>As described above, the default section

-parser uses a simple grammar of sections identified by numbers followed by periods,

-and subsections identified by the pattern of a number followed by a period, repeated

-an arbitrary number of times, and ending with a number.

-<p><a href="hglegal.htm"><img src="ngibmcpy.gif" alt="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." width="195" height="12" border="0"></a></p>

-

-</body>

-</html>

diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action1.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action1.gif
deleted file mode 100644
index aaee87f..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action1.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action2.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action2.gif
deleted file mode 100644
index 2281dd0..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action2.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action3.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action3.gif
deleted file mode 100644
index e381e68..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/action3.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/openbrwsr.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/openbrwsr.gif
deleted file mode 100644
index b0168f0..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/ctool16/openbrwsr.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/cview16/sections.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/cview16/sections.gif
deleted file mode 100644
index 7e5aa62..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/cview16/sections.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action1.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action1.gif
deleted file mode 100644
index 1e172f5..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action1.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action2.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action2.gif
deleted file mode 100644
index cf6cf11..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action2.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action3.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action3.gif
deleted file mode 100644
index c58f6bd..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/action3.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/openbrwsr.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/openbrwsr.gif
deleted file mode 100644
index fb714eb..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/dtool16/openbrwsr.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action1.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action1.gif
deleted file mode 100644
index 4745d76..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action1.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action2.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action2.gif
deleted file mode 100644
index 11b1410..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action2.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action3.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action3.gif
deleted file mode 100644
index a2ecf22..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/action3.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/openbrwsr.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/openbrwsr.gif
deleted file mode 100644
index 4909867..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/etool16/openbrwsr.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/eview16/sections.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/eview16/sections.gif
deleted file mode 100644
index 247c40e..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/eview16/sections.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/editor.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/editor.gif
deleted file mode 100644
index 87066a0..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/editor.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/newreadme_wiz.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/newreadme_wiz.gif
deleted file mode 100644
index 42447db..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/newreadme_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/usereditor.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/usereditor.gif
deleted file mode 100644
index 4e25088..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/obj16/usereditor.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/view16/sections.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/view16/sections.gif
deleted file mode 100644
index 7e5aa62..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/view16/sections.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/basic/wizban/newreadme_wiz.gif b/examples/org.eclipse.ui.examples.readmetool/icons/basic/wizban/newreadme_wiz.gif
deleted file mode 100644
index 736913e..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/basic/wizban/newreadme_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action1.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action1.gif
deleted file mode 100644
index 91077ef..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action1.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action2.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action2.gif
deleted file mode 100644
index c2a3e17..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action2.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action3.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action3.gif
deleted file mode 100644
index 9c14f74..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/action3.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/openbrwsr.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/openbrwsr.gif
deleted file mode 100644
index bbaba27..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/ctool16/openbrwsr.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/cview16/sections.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/cview16/sections.gif
deleted file mode 100644
index 008fd7a..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/cview16/sections.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action1.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action1.gif
deleted file mode 100644
index 0c50830..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action1.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action2.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action2.gif
deleted file mode 100644
index 3f978df..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action2.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action3.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action3.gif
deleted file mode 100644
index f9f1e95..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/action3.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/openbrwsr.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/openbrwsr.gif
deleted file mode 100644
index d123cfc..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/dtool16/openbrwsr.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action1.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action1.gif
deleted file mode 100644
index 55fb1a6..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action1.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action2.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action2.gif
deleted file mode 100644
index f801d2e..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action2.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action3.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action3.gif
deleted file mode 100644
index 5e199b1..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/action3.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/openbrwsr.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/openbrwsr.gif
deleted file mode 100644
index 9a4c048..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/etool16/openbrwsr.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/eview16/sections.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/eview16/sections.gif
deleted file mode 100644
index e1a5b31..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/eview16/sections.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/editor.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/editor.gif
deleted file mode 100644
index c48d9a9..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/editor.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/newreadme_wiz.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/newreadme_wiz.gif
deleted file mode 100644
index 293826d..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/newreadme_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/usereditor.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/usereditor.gif
deleted file mode 100644
index 64d7907..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/obj16/usereditor.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/icons/full/wizban/newreadme_wiz.gif b/examples/org.eclipse.ui.examples.readmetool/icons/full/wizban/newreadme_wiz.gif
deleted file mode 100644
index 3265aaf..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/icons/full/wizban/newreadme_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.ui.examples.readmetool/plugin.properties b/examples/org.eclipse.ui.examples.readmetool/plugin.properties
deleted file mode 100644
index 04e9501..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-Plugin.name = Readme File Editing Tool

-ExtPoint.sectionParser = Section parser for Readme file editor

-SectionParser.name = Default section parser for Readme tool

-ActionSet.name = ReadMe Actions

-ActionSet.menu = Readme &File Editor

-ReadmeAction.label = &Open Readme Browser@Ctrl+R

-ReadmeAction.tooltip = Open Readme Browser

-NewWizard.category = Example Creation Wizards

-NewWizard.name = Readme File

-NewWizard.desc = An example of a wizard that creates sample Readme file

-Editors.ReadmeEditor = Readme File Editor

-Views.category = &Readme

-Views.ReadmeSections = Readme Sections

-PreferencePage.name = Readme Example

-PropertiesPage.filePage = Readme Tool

-PropertiesPage.filePage2 = More Readme Info

-PopupMenus.action = Show Readme Action

-PopupMenu.ResourceNav.label = &Readme View Extension

-PopupMenu.ResourceNav.tooltip = Run Readme View Extension

-Editors.Action.label = &Readme Editor Extension

-Editors.Action.tooltip = Run Readme Editor Extension
\ No newline at end of file
diff --git a/examples/org.eclipse.ui.examples.readmetool/plugin.xml b/examples/org.eclipse.ui.examples.readmetool/plugin.xml
deleted file mode 100644
index 3b71dbd..0000000
--- a/examples/org.eclipse.ui.examples.readmetool/plugin.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!-- ======================================================================= -->

-<!-- The Readme tool is a sample plugin which demonstrates many available    -->

-<!-- extension points provided by the workbench, as well as providing its own  -->

-<!-- extension point for other plugins to use.                               -->

-<!-- ======================================================================= -->

-<plugin

-   name = "%Plugin.name"

-   id = "org.eclipse.ui.examples.readmetool"

-   version = "1.0"

-   provider-name = "Object Technology International, Inc."

-   class="org.eclipse.ui.examples.readmetool.ReadmePlugin">

-

-   <requires>

-      <import plugin="org.eclipse.ui"/>

-      <import plugin="org.eclipse.core.resources"/>

-   </requires>

-

-   <runtime>

-     <library name="readmetool.jar"/> 

-   </runtime>

-

-   <!-- ================================================================== -->

-   <!-- Extension point: org.eclipse.ui.examples.readmetool.sectionParser  -->

-   <!-- Purpose: Provide a custom parser for Readme files which determines -->

-   <!--          the file's section and subsection structure               -->

-   <!-- Extension Implementation: must implement                           -->

-   <!--         org.eclipse.ui.examples.readmetool.IReadmeFileParser    -->

-   <!-- ================================================================== -->

-   <extension-point name="%ExtPoint.sectionParser" id="sectionParser"/>

-

-   <extension

-        point="org.eclipse.ui.examples.readmetool.sectionParser">

-      <parser

-          name="%SectionParser.name"

-          id="org.eclipse.ui.examples.readmetool.DefaultSectionsParser"

-          class="org.eclipse.ui.examples.readmetool.DefaultSectionsParser">

-      </parser>

-   </extension>

-

-   <extension point = "org.eclipse.ui.actionSets">

-	   <actionSet id="org_eclipse_ui_examples_readmetool_actionSet"

-		   label="%ActionSet.name"

-		   visible="true">

-		   <menu id="org_eclipse_ui_examples_readmetool"

-			   label="%ActionSet.menu"

-			   path="window/additions"> 

-			   <separator name="slot1"/>

-			   <separator name="slot2"/>

-			   <separator name="slot3"/>

-		   </menu>

-		   <action id="org_eclipse_ui_examples_readmetool_readmeAction"

-			   menubarPath="window/org_eclipse_ui_examples_readmetool/slot1"

-			   toolbarPath="readme"

-			   label="%ReadmeAction.label"

-			   tooltip="%ReadmeAction.tooltip"

-			   helpContextId="org.eclipse.ui.examples.readmetool.open_browser_action_context"

-			   icon="icons/basic/ctool16/openbrwsr.gif"

-			   class="org.eclipse.ui.examples.readmetool.WindowActionDelegate"

-			   enablesFor="1">

-			   <selection class="org.eclipse.core.resources.IFile"

-					name="*.readme">

-			   </selection>

-		   </action>

-	   </actionSet>

-   </extension>

-

-   <extension

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

-	<category

-	   id = "org.eclipse.ui.examples.readmetool.new"

-	   parentCategory="org.eclipse.ui.Examples"

-	   name="%NewWizard.category">

-	</category>

- 	<wizard

-	   id = "org.eclipse.ui.examples.readmetool.wizards.new.file"

-      	   name = "%NewWizard.name"

-	   class="org.eclipse.ui.examples.readmetool.ReadmeCreationWizard"

-	   category="org.eclipse.ui.Examples/org.eclipse.ui.examples.readmetool.new"

-	   icon="icons/basic/obj16/newreadme_wiz.gif">

-    	   <description>%NewWizard.desc</description>

-	   <selection class="org.eclipse.core.resources.IResource"/>

-	</wizard>

-   </extension>

-

-   <extension

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

-	<editor

-  	   id = "org.eclipse.ui.examples.readmetool.ReadmeEditor"

-  	   name="%Editors.ReadmeEditor"

-      	   icon="icons/basic/obj16/editor.gif"

-      	   class="org.eclipse.ui.examples.readmetool.ReadmeEditor"

-	   extensions="readme"

-           contributorClass="org.eclipse.ui.examples.readmetool.ReadmeEditorActionBarContributor">

-	</editor>

-   </extension>

-

-

-   <extension 

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

-	<category 

-	   id="org.eclipse.ui.examples.readmetool"

-	   name="%Views.category">

-	</category>

-	<view

- 	   id="org.eclipse.ui.examples.readmetool.views.SectionsView"

-	   name="%Views.ReadmeSections"

-	   icon="icons/basic/view16/sections.gif"

-	   category="org.eclipse.ui.examples.readmetool"

-	   class="org.eclipse.ui.examples.readmetool.ReadmeSectionsView">

-	</view>

-   </extension>

-  

-   <extension

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

-       <page id="org.eclipse.ui.examples.readmetool.Page1"

-	      class="org.eclipse.ui.examples.readmetool.ReadmePreferencePage"

-            name="%PreferencePage.name">

-       </page>

-   </extension>

-

-  <extension

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

-        <page

-           id="org.eclipse.ui.examples.readmetool.FilePage"

-           name="%PropertiesPage.filePage"

-	   objectClass="org.eclipse.core.resources.IFile"

-	   class="org.eclipse.ui.examples.readmetool.ReadmeFilePropertyPage"

-           nameFilter="*.readme">

-        </page>

-         <page

-            id="org.eclipse.ui.examples.readmetool.FilePage2"

-            name="%PropertiesPage.filePage2"

- 	   objectClass="org.eclipse.core.resources.IFile"

- 	   class="org.eclipse.ui.examples.readmetool.ReadmeFilePropertyPage2"

-            nameFilter="*.readme">

-         </page>

-  </extension>

-

-  <extension point = "org.eclipse.ui.popupMenus">

-     <objectContribution

-        id="org.eclipse.ui.examples.readmetool"

-        objectClass="org.eclipse.core.resources.IFile"

-	    nameFilter="*.readme">

-	    <action id="org.eclipse.ui.examples.readmetool.action1"

-	       label="%PopupMenus.action"

-	       icon="icons/basic/ctool16/openbrwsr.gif"

-	       menubarPath="additions"

-	       helpContextId="org.eclipse.ui.examples.readmetool.open_browser_action_context"

-	       class="org.eclipse.ui.examples.readmetool.PopupMenuActionDelegate"	

-	       enablesFor="1">

-	    </action>

-	 </objectContribution>

-     <viewerContribution

-        id="org.eclipse.ui.examples.readmetool2"

-        targetID="org.eclipse.ui.examples.readmetool.outline">

-	    <action id="org.eclipse.ui.examples.readmetool.action1"

-	       label="%PopupMenus.action"

-	       icon="icons/basic/ctool16/openbrwsr.gif"

-	       menubarPath="additions"

-	       helpContextId="org.eclipse.ui.examples.readmetool.open_browser_action_context"

-	       class="org.eclipse.ui.examples.readmetool.ViewActionDelegate">	

-	    </action>

-	 </viewerContribution>

-  </extension>

-

-<extension

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

-      <viewContribution 

-         id="org.eclipse.ui.examples.readmetool.vc1" 

-         targetID="org.eclipse.ui.views.ResourceNavigator">        

-			<action id="org.eclipse.ui.examples.readmetool.va1" 

-              label="%PopupMenu.ResourceNav.label" 

-			  menubarPath="additions"

-              toolbarPath="additions" 

-              icon="icons/basic/obj16/editor.gif" 

-              tooltip="%PopupMenu.ResourceNav.tooltip" 

-   	      helpContextId="org.eclipse.ui.examples.readmetool.view_action_context"

-              class="org.eclipse.ui.examples.readmetool.ViewActionDelegate" 

-              enablesFor="1"> 

-			  <selection class="org.eclipse.core.resources.IFile" name="*.readme"/> 

-			</action>

-		</viewContribution>

- </extension>

-

-<extension

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

-      <editorContribution 

-         id="org.eclipse.ui.examples.readmetool.ec1" 

-         targetID="org.eclipse.ui.examples.readmetool.ReadmeEditor">        

-			<action id="org.eclipse.ui.examples.readmetool.ea1" 

-              label="%Editors.Action.label" 

-	      toolbarPath="ReadmeEditor" 

-              icon="icons/basic/obj16/editor.gif" 

-              tooltip="%Editors.Action.tooltip" 

-              class="org.eclipse.ui.examples.readmetool.EditorActionDelegate" 

-              /> 

-		</editorContribution>

- </extension>

-

-  <extension point="org.eclipse.help.contexts"> 

-    <contexts name="HelpContexts.xml"/> 

-  </extension>

-

-  <extension

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

-        <action

-	      id="org_eclipse_ui_examples_readmetool_drop_actions"                

-		class="org.eclipse.ui.examples.readmetool.ReadmeDropActionDelegate">

-        </action>

-  </extension>

-

-

-</plugin>
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/.classpath b/tests/org.eclipse.ui.tests/.classpath
deleted file mode 100644
index f221cdb..0000000
--- a/tests/org.eclipse.ui.tests/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="var" path="ECLIPSE_HOME/startup.jar"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.boot/boot.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.boot/bootsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resources.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resourcessrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtime.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtimesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt/swt.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.swt/swtsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.junit/junit.jar" sourcepath="ECLIPSE_PLUGINS/org.junit/src.jar"/>
-    <classpathentry kind="src" path="Eclipse UI Tests"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.junit.eclipse"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.junit"/>
-    <classpathentry kind="src" path="Eclipse JFace Tests"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.ui.tests/.cvsignore b/tests/org.eclipse.ui.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/tests/org.eclipse.ui.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/.vcm_meta b/tests/org.eclipse.ui.tests/.vcm_meta
deleted file mode 100644
index a538685..0000000
--- a/tests/org.eclipse.ui.tests/.vcm_meta
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<comment></comment>

-	<nature id="org.eclipse.jdt.core.javanature"/>

-	<nature id="org.eclipse.pde.PluginNature"/>

-	<reference project-name="org.eclipse.ui"/>

-	<reference project-name="org.eclipse.jdt.junit.eclipse"/>

-	<reference project-name="org.eclipse.jdt.junit"/>

-	<builder name="org.eclipse.jdt.core.javabuilder">

-	</builder>

-	<builder name="org.eclipse.pde.ManifestBuilder">

-	</builder>

-	<builder name="org.eclipse.pde.SchemaBuilder">

-	</builder>

-</project-description>

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/preferences/FontPreferenceTestCase.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/preferences/FontPreferenceTestCase.java
deleted file mode 100644
index 0862cf5..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/preferences/FontPreferenceTestCase.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.eclipse.jface.tests.preferences;

-

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

-import org.eclipse.jdt.junit.util.UITestCase;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.PreferenceConverter;

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

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

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

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

-import org.eclipse.ui.PlatformUI;

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

-

-/**

- * The FontPreferenceTestCase tests adding fonts to

- * the preference store and what occurs if the values

- * are bogus

- */

-

-public class FontPreferenceTestCase extends UITestCase {

-

-	public String BAD_FONT_DEFINITION = "BadFont-regular-10";

-	public String TEST_FONT_ID = "org.eclipse.jface.tests.preference.testfont";

-	public String MISSING_FONT_ID =

-		"org.eclipse.jface.tests.preference.missingfont";

-

-	private IPreferenceStore preferenceStore;

-

-	/**

-	 * Constructor for FontPreferenceTestCase.

-	 * @param testName

-	 */

-	public FontPreferenceTestCase(String testName) {

-		super(testName);

-	}

-

-	/*

-	 * @see TestCase#setUp

-	 */

-	protected void setUp() throws Exception {

-		super.setUp();

-		AbstractUIPlugin plugin =

-			(AbstractUIPlugin) Platform.getPlugin(PlatformUI.PLUGIN_ID);

-		preferenceStore = plugin.getPreferenceStore();

-

-		FontRegistry registry = JFaceResources.getFontRegistry();

-		//Set up the bogus entry for the bad first test

-		FontData bogusData = new FontData();

-		bogusData.setName("BadData");

-		bogusData.setHeight(11);

-		FontData[] storedValue = new FontData[2];

-

-		//We assume here that the text font is OK

-		storedValue[0] = bogusData;

-		storedValue[1] =

-			(PreferenceConverter

-				.getDefaultFontDataArray(preferenceStore, JFaceResources.TEXT_FONT))[0];

-		PreferenceConverter.setValue(preferenceStore,TEST_FONT_ID,storedValue);

-		PreferenceConverter.setDefault(preferenceStore,TEST_FONT_ID,storedValue);

-

-	}

-	

-	

-	/**

-	 * Test for a valid font like the test font. The first good one

-	 * we should find should be the first one in the list.

-	 */

-	

-	public void testGoodFontDefinition(){

-		

-		FontRegistry fontRegistry = JFaceResources.getFontRegistry();

-		FontData[] currentTextFonts = 

-			PreferenceConverter.getFontDataArray(preferenceStore, JFaceResources.TEXT_FONT);

-		FontData bestFont = fontRegistry.bestData(currentTextFonts,Display.getCurrent());

-		

-		//Assert that it is the first font that we get as the

-		//valid one

-		assertEquals(bestFont.getName(),currentTextFonts[0].getName());

-		assertEquals(bestFont.getHeight(),currentTextFonts[0].getHeight());

-	}

-	

-	/**

-	 * Test that if the first font in the list is bad that the 

-	 * second one comes back as valid.

-	 */

-	

-	public void testBadFirstFontDefinition(){

-		

-		FontRegistry fontRegistry = JFaceResources.getFontRegistry();

-		FontData[] currentTestFonts = 

-			PreferenceConverter.getFontDataArray(preferenceStore, TEST_FONT_ID);

-		FontData bestFont = fontRegistry.bestData(currentTestFonts,Display.getCurrent());

-		

-		//Assert that it is the second font that we get as the

-		//valid one

-		assertEquals(bestFont.getName(),currentTestFonts[1].getName());

-		assertEquals(bestFont.getHeight(),currentTestFonts[1].getHeight());

-	}

-	

-	/**

-	 * Test that the no valid font is returned when the entry

-	 * is missing.

-	 */

-	

-	public void testNoFontDefinition(){

-		

-		FontRegistry fontRegistry = JFaceResources.getFontRegistry();

-		FontData[] currentTestFonts = 

-			PreferenceConverter.getFontDataArray(preferenceStore, MISSING_FONT_ID);

-		FontData bestFont = fontRegistry.bestData(currentTestFonts,Display.getCurrent());

-		

-		FontData[] systemFontData = Display.getCurrent().getSystemFont().getFontData();

-		

-		//Assert that the first font is the system font

-		assertEquals(bestFont.getName(),systemFontData[0].getName());

-		assertEquals(bestFont.getHeight(),systemFontData[0].getHeight());

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java
deleted file mode 100644
index 0a39318..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-import org.eclipse.jface.*;

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

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

-import org.eclipse.swt.SWT;

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

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

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

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

-import java.util.*;

-import junit.framework.*;

-

-public abstract class AbstractTreeViewerTest extends StructuredItemViewerTest {

-	

-	AbstractTreeViewer fTreeViewer;

-	

-	public AbstractTreeViewerTest(String name) {

-		super(name);

-	}

-	protected void assertEqualsArray(String s, Object[] a1, Object[] a2) {

-		int s1= a1.length;

-		int s2= a2.length;

-		assertTrue(s, s1 == s2);

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

-			assertEquals(s, a1[i], a2[i]);

-		}

-	}

-	protected abstract int getItemCount(TestElement element);   //was IElement

-public void testBulkExpand() {

-	// navigate

-	TestElement first = fRootElement.getFirstChild();

-	TestElement first2 = first.getFirstChild();

-	TestElement last = fRootElement.getLastChild();

-

-	// expand a few nodes

-	fTreeViewer.expandToLevel(first, 2);

-	fTreeViewer.expandToLevel(first2, 2);

-	fTreeViewer.expandToLevel(last, 2);

-

-	// get expand state

-	Object[] list1 = fTreeViewer.getExpandedElements();

-

-	// flush viewer

-	fViewer.setInput(fRootElement);

-

-	// restore old expand state

-	fTreeViewer.collapseAll();

-	fTreeViewer.expandToLevel(first, 2);

-	fTreeViewer.expandToLevel(first2, 2);

-	fTreeViewer.expandToLevel(last, 2);

-	

-	Object[] list2 = fTreeViewer.getExpandedElements();

-

-	assertEqualsArray("old and new expand state are the same", list1, list2);

-}

-	public void testDeleteChildExpanded() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement first2= first.getFirstChild();

-		fTreeViewer.expandToLevel(first2,0);

-		

-		assertNotNull("first child is visible", fViewer.testFindItem(first2));		

-		first.deleteChild(first2);

-		assertNull("first child is not visible", fViewer.testFindItem(first2));

-	}

-	public void testDeleteChildren() {

-		TestElement first= fRootElement.getFirstChild();		

-		first.deleteChildren();

-		assertTrue("no children", getItemCount(first) == 0);

-	}

-	public void testDeleteChildrenExpanded() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement first2= first.getFirstChild();

-		fTreeViewer.expandToLevel(first2,0);

-		assertNotNull("first child is visible", fViewer.testFindItem(first2));

-		

-		first.deleteChildren();

-		assertTrue("no children", getItemCount(first) == 0);

-	}

-	public void testExpand() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement first2= first.getFirstChild();

-		assertNull("first child is not visible", fViewer.testFindItem(first2));		

-		fTreeViewer.expandToLevel(first2,0);	

-		assertNotNull("first child is visible", fViewer.testFindItem(first2));		

-	}

-public void testExpandElement() {

-	TestElement first = fRootElement.getFirstChild();

-	TestElement first2 = first.getFirstChild();

-	TestElement first3 = first2.getFirstChild();

-	fTreeViewer.expandToLevel(first3, 0);

-	assertNotNull("first3 is visible", fViewer.testFindItem(first3));

-	assertNotNull("first2 is visible", fViewer.testFindItem(first2));

-}

-	public void testExpandToLevel() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement first2= first.getFirstChild();

-		fTreeViewer.expandToLevel(2);	

-		assertNotNull("first2 is visible", fViewer.testFindItem(first2));		

-	}

-	public void testFilterExpanded() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement first2= first.getFirstChild();

-		fTreeViewer.expandToLevel(first2,0);  

-

-		fTreeViewer.addFilter(new TestLabelFilter());

-		assertTrue("filtered count", getItemCount() == 5);

-	}

-	public void testInsertChildReveal() {

-		TestElement first= fRootElement.getFirstChild();		

-		TestElement newElement= first.addChild(TestModelChange.INSERT | TestModelChange.REVEAL);

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-	}

-	public void testInsertChildRevealSelect() {

-		TestElement last= fRootElement.getLastChild();

-		TestElement newElement= last.addChild(TestModelChange.INSERT | TestModelChange.REVEAL | TestModelChange.SELECT);

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-		assertSelectionEquals("new element is selected", newElement);

-	}

-	public void testInsertChildRevealSelectExpanded() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement newElement= first.addChild(TestModelChange.INSERT | TestModelChange.REVEAL | TestModelChange.SELECT);

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-		assertSelectionEquals("new element is selected", newElement);

-	}

-	/**

-	 * Regression test for 1GDN0PX: ITPUI:WIN2000 - SEVERE  - AssertionFailure when expanding Navigator

-	 * Problem was:

-	 *   - before addition, parent item had no children, and was expanded

-	 *   - after addition, during refresh(), updatePlus() added dummy node even though parent item was expanded

-	 *   - in updateChildren, it wasn't handling a dummy node

-	 */

-	public void testRefreshWithAddedChildren() {

-		TestElement parent = fRootElement.addChild(TestModelChange.INSERT);

-		TestElement child = parent.addChild(TestModelChange.INSERT);

-		((AbstractTreeViewer) fViewer).setExpandedState(parent, true);

-		parent.deleteChild(child);

-		child = parent.addChild(TestModelChange.STRUCTURE_CHANGE);

-		assertNotNull("new child is visible", fViewer.testFindItem(child));

-	}

-	/**

-	 * Regression test for 1GBDB5A: ITPUI:WINNT - Exception in AbstractTreeViewer update.

-	 * Problem was:

-	 *   node has child A

-	 *   node gets duplicate child A

-	 *   viewer is refreshed rather than using add for new A

-	 *   AbstractTreeViewer.updateChildren(...) was not properly handling it

-	 */

-	public void testRefreshWithDuplicateChild() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement newElement= (TestElement) first.clone();

-		fRootElement.addChild(newElement, new TestModelChange(TestModelChange.STRUCTURE_CHANGE, fRootElement));

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-	}

-	public void testRenameChildElement() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement first2= first.getFirstChild();

-		fTreeViewer.expandToLevel(first2,0);

-		assertNotNull("first child is visible", fViewer.testFindItem(first2));

-				

-		String newLabel= first2.getLabel()+" changed";

-		first2.setLabel(newLabel);

-		Widget widget= fViewer.testFindItem(first2);

-		assertTrue(widget instanceof Item);

-		assertEquals("changed label", first2.getID()+" "+newLabel, ((Item)widget).getText());

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AllTests.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AllTests.java
deleted file mode 100644
index c825d97..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/AllTests.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import junit.framework.*;

-

-public class AllTests {

-

-	public static void main(String[] args) {

-		junit.textui.TestRunner.run(suite());

-	}

-	public static Test suite() {

-		TestSuite suite= new TestSuite();

-		suite.addTest(new TestSuite(TreeViewerTest.class));

-		suite.addTest(new TestSuite(TableViewerTest.class));

-		suite.addTest(new TestSuite(TableTreeViewerTest.class));

-		suite.addTest(new TestSuite(ListViewerTest.class));

-		suite.addTest(new TestSuite(CheckboxTableViewerTest.class));

-		suite.addTest(new TestSuite(CheckboxTreeViewerTest.class));

-		return suite;

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
deleted file mode 100644
index eee39ad..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-import org.eclipse.jface.*;

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

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

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

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

-import org.eclipse.swt.SWT;

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

-import java.util.*;

-import junit.framework.*;

-

-

-public class CheckboxTableViewerTest extends TableViewerTest {

-public static class CheckboxTableTestLabelProvider

-	extends TestLabelProvider

-	implements ITableLabelProvider {

-		

-	public boolean fExtended = false;

-

-	public String getText(Object element) {

-		if (fExtended)

-			return providedString((String) element);

-		return element.toString();

-	}

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

-		if (fExtended)

-			return providedString((TestElement) element);

-		return element.toString();

-	}

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

-		return null;

-	}

-}	

-	public CheckboxTableViewerTest(String name) {

-		super(name);

-	}

-protected StructuredViewer createViewer(Composite parent) {

-	Table table = new Table(parent, SWT.CHECK | SWT.BORDER);

-	table.setLinesVisible(true);

-	TableLayout layout = new TableLayout();

-	table.setLayout(layout);

-	table.setHeaderVisible(true);

-

-	String headers[] = { "column 1 header", "column 2 header" };

-

-	ColumnLayoutData layouts[] =

-		{ new ColumnWeightData(100), new ColumnWeightData(100)};

-

-	final TableColumn columns[] = new TableColumn[headers.length];

-

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

-		layout.addColumnData(layouts[i]);

-		TableColumn tc = new TableColumn(table, SWT.NONE, i);

-		tc.setResizable(layouts[i].resizable);

-		tc.setText(headers[i]);

-		columns[i] = tc;

-	}

-

-	TableViewer viewer = new CheckboxTableViewer(table);

-	viewer.setContentProvider(new TestModelContentProvider());

-	viewer.setLabelProvider(new TableTestLabelProvider());

-	return viewer;

-}

-	public static void main(String args[]) {

-		junit.textui.TestRunner.run(CheckboxTableViewerTest.class);

-	}

-	public void testCheckAllElements() {

-		CheckboxTableViewer ctv= (CheckboxTableViewer)fViewer;

-		ctv.setAllChecked(true);

-		assertTrue(ctv.getChecked(fRootElement.getFirstChild()));

-		assertTrue(ctv.getChecked(fRootElement.getLastChild()));

-		ctv.setAllChecked(false);

-		assertTrue(!ctv.getChecked(fRootElement.getFirstChild()));

-		assertTrue(!ctv.getChecked(fRootElement.getLastChild()));

-	}

-	public void testGrayAllElements() {

-		CheckboxTableViewer ctv= (CheckboxTableViewer)fViewer;

-		ctv.setAllGrayed(true);

-		assertTrue(ctv.getGrayed(fRootElement.getFirstChild()));

-		assertTrue(ctv.getGrayed(fRootElement.getLastChild()));

-		ctv.setAllGrayed(false);

-		assertTrue(!ctv.getGrayed(fRootElement.getFirstChild()));

-		assertTrue(!ctv.getGrayed(fRootElement.getLastChild()));

-	}

-	public void testGrayed() {

-		CheckboxTableViewer ctv= (CheckboxTableViewer)fViewer;

-		TestElement element= fRootElement.getFirstChild();

-		

-		assertTrue(ctv.getGrayedElements().length == 0);

-		assertTrue(!ctv.getGrayed(element));

-		

-		ctv.setGrayed(element, true);

-		assertTrue(ctv.getGrayedElements().length == 1);

-		assertTrue(ctv.getGrayed(element));

-		

-		ctv.setGrayed(element, false);

-		assertTrue(ctv.getGrayedElements().length == 0);

-		assertTrue(!ctv.getGrayed(element));		

-		

-		ctv.setAllGrayed(false);

-	}

-	public void testGrayedElements() {

-		CheckboxTableViewer ctv= (CheckboxTableViewer)fViewer;

-		TestElement first= fRootElement.getFirstChild();

-		TestElement last= fRootElement.getLastChild();

-		

-		assertTrue(ctv.getGrayedElements().length == 0);

-		assertTrue(!ctv.getGrayed(first));

-		assertTrue(!ctv.getGrayed(last));

-		

-		ctv.setGrayed(first, true);

-		ctv.setGrayed(last, true);

-		Object[] elements= ctv.getGrayedElements();

-		assertTrue(elements.length == 2);

-		assertTrue(elements[0] == first);

-		assertTrue(elements[1] == last);

-		

-		ctv.setGrayed(first, false);

-		ctv.setGrayed(last, false);

-		assertTrue(ctv.getGrayedElements().length == 0);

-		

-		ctv.setAllGrayed(false);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java
deleted file mode 100644
index 61c0a55..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-import org.eclipse.jface.*;

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

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

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

-import junit.framework.*;

-import java.util.*;

-

-public class CheckboxTreeViewerTest extends TreeViewerTest {

-	public static class CheckboxTableTestLabelProvider

-		extends TestLabelProvider

-		implements ITableLabelProvider {

-

-		public boolean fExtended = false;

-

-		public String getText(Object element) {

-			if (fExtended)

-				return providedString((String) element);

-			return element.toString();

-		}

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

-			if (fExtended)

-				return providedString((TestElement) element);

-			return element.toString();

-		}

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

-			return null;

-		}

-	}

-	public CheckboxTreeViewerTest(String name) {

-		super(name);

-	}

-	protected StructuredViewer createViewer(Composite parent) {

-		fTreeViewer = new CheckboxTreeViewer(parent);

-		fTreeViewer.setContentProvider(new TestModelContentProvider());

-		return fTreeViewer;

-	}

-	public static void main(String args[]) {

-		junit.textui.TestRunner.run(CheckboxTreeViewerTest.class);

-	}

-	public void testCheckSubtree() {

-		CheckboxTreeViewer ctv = (CheckboxTreeViewer) fViewer;

-		TestElement first = fRootElement.getFirstChild();

-		TestElement firstfirst = first.getFirstChild();

-		TestElement firstfirstfirst = firstfirst.getFirstChild();

-		fTreeViewer.expandToLevel(firstfirst, 0);

-

-		ctv.setSubtreeChecked(first, true);

-		assertTrue(ctv.getChecked(firstfirst));

-		ctv.setSubtreeChecked(first, false);

-		assertTrue(!ctv.getChecked(firstfirst));

-

-		// uncheck invisible subtree

-		assertTrue(ctv.setSubtreeChecked(firstfirstfirst, false));

-		assertTrue(!ctv.getChecked(firstfirstfirst));

-	}

-	public void testGrayed() {

-		CheckboxTreeViewer ctv = (CheckboxTreeViewer) fViewer;

-		TestElement element = fRootElement.getFirstChild();

-

-		assertTrue(ctv.getGrayedElements().length == 0);

-		assertTrue(!ctv.getGrayed(element));

-

-		ctv.setGrayed(element, true);

-		assertTrue(ctv.getGrayedElements().length == 1);

-		assertTrue(ctv.getGrayed(element));

-

-		ctv.setGrayed(element, false);

-		assertTrue(ctv.getGrayedElements().length == 0);

-		assertTrue(!ctv.getGrayed(element));

-	}

-	public void testParentGrayed() {

-		CheckboxTreeViewer ctv = (CheckboxTreeViewer) fViewer;

-		TestElement first = fRootElement.getFirstChild();

-		TestElement firstfirst = first.getFirstChild();

-		TestElement firstfirstfirst = firstfirst.getFirstChild();

-		ctv.expandToLevel(firstfirstfirst, 0);

-

-		ctv.setParentsGrayed(firstfirstfirst, true);

-		Object[] elements = ctv.getGrayedElements();

-		assertTrue(elements.length == 3);

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

-			assertTrue(ctv.getGrayed(elements[i]));

-		};

-

-		assertTrue(elements[0] == first);

-		assertTrue(elements[1] == firstfirst);

-		assertTrue(elements[2] == firstfirstfirst);

-		ctv.setParentsGrayed(firstfirstfirst, false);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ITestModelListener.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ITestModelListener.java
deleted file mode 100644
index ca72f68..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ITestModelListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-public interface ITestModelListener {

-	public void testModelChanged(TestModelChange change);

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java
deleted file mode 100644
index 8397706..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.swt.SWT;

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

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

-import junit.framework.*;

-

-public class ListViewerTest extends StructuredViewerTest {

-	

-	public ListViewerTest(String name) {

-		super(name);

-	}

-	protected StructuredViewer createViewer(Composite parent) {

-		ListViewer viewer= new ListViewer(parent);

-		viewer.setContentProvider(new TestModelContentProvider());

-		return viewer;

-	}

-	protected int getItemCount() {

-		TestElement first= fRootElement.getFirstChild();

-		List list= (List)fViewer.testFindItem(first);

-		return list.getItemCount();

-	}

-	protected String getItemText(int at) {

-		List list= (List) fViewer.getControl();

-		return list.getItem(at);

-	}

-	public static void main(String args[]) {

-		junit.textui.TestRunner.run(ListViewerTest.class);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java
deleted file mode 100644
index 5ce6e94..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-import org.eclipse.jface.*;

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

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

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

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

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

-import java.util.*;

-import junit.framework.*;

-

-

-public abstract class StructuredItemViewerTest extends StructuredViewerTest {

-

-	public StructuredItemViewerTest(String name) {

-		super(name);

-	}

-public void testCheckElement() {

-

-	if (fViewer instanceof ICheckable) {

-		TestElement first = fRootElement.getFirstChild();

-		TestElement firstfirst = first.getFirstChild();

-

-		ICheckable ctv = (ICheckable) fViewer;

-		ctv.setChecked(first, true);

-		assertTrue(ctv.getChecked(first));

-

-		// checking an invisible element

-		if (fViewer instanceof AbstractTreeViewer) {

-			// The first child of the first child can only be resolved in a tree

-			assertTrue(ctv.setChecked(firstfirst, true));

-			assertTrue(ctv.getChecked(firstfirst));

-		} else {

-			assertTrue(!ctv.setChecked(firstfirst, true));

-			assertTrue(!ctv.getChecked(firstfirst));

-		}

-

-		ctv.setChecked(first, false);

-		assertTrue(!ctv.getChecked(first));

-	}

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredSelectionTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredSelectionTest.java
deleted file mode 100644
index 05a7fb2..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredSelectionTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-import java.util.*;

-import junit.framework.*;

-

-public class StructuredSelectionTest extends TestCase {

-

-	public StructuredSelectionTest(String name) {

-		super(name);

-	}

-	public static void main(String args[]) {

-		junit.textui.TestRunner.run(StructuredSelectionTest.class);

-	}

-	public void testEquals() {

-		String element= "A selection";

-		StructuredSelection sel1= new StructuredSelection(element);

-		StructuredSelection sel2= new StructuredSelection(element);

-		assertEquals(sel1, sel2);

-	}

-	public void testEquals2() {

-		String element1= "A selection";

-		String element2= "A selection";

-		String element3= "Other";

-		StructuredSelection sel1= new StructuredSelection(element1);

-		StructuredSelection sel2= new StructuredSelection(element2);

-		StructuredSelection sel3= new StructuredSelection(element3);

-		assertEquals(sel1, sel2);

-		assertTrue(!sel1.equals(sel3));

-	}

-	public void testEquals3() {	// two empty selections

-		StructuredSelection empty1= new StructuredSelection();

-		StructuredSelection empty2= new StructuredSelection();

-		assertTrue(empty1.equals(empty2));

-		assertTrue(empty2.equals(empty1));

-	}

-	public void testEquals4() {	// empty selection with non-empty selection

-		StructuredSelection sel= new StructuredSelection("A selection");

-		StructuredSelection empty= new StructuredSelection();

-		assertTrue(!sel.equals(empty));

-		assertTrue(!empty.equals(sel));

-	}

-	public void testEquals5() { // equality is order-dependent

-	    List l1 = new ArrayList();

-	    l1.add("element 1");

-	    l1.add("element 2");

-

-	    List l2 = new ArrayList();

-	    l2.add("element 2");

-	    l2.add("element 1");

-

-	    StructuredSelection sel1 = new StructuredSelection(l1);

-	    StructuredSelection sel2 = new StructuredSelection(l2);

-	    assertTrue(!sel1.equals(sel2));

-	    assertTrue(!sel2.equals(sel1));

-	}

-	public void testEquals6() {	// equality is independent from order

-	    List l1 = new ArrayList();

-		l1.add("element 1");

-		l1.add("element 2");

-		

-	    List l2 = new ArrayList();

-		l2.add("element 2");

-		l2.add("element 3");

-		l2.add("element 1");

-		

-		StructuredSelection sel1= new StructuredSelection(l1);

-		StructuredSelection sel2= new StructuredSelection(l2);

-		assertTrue(!sel1.equals(sel2));

-		assertTrue(!sel2.equals(sel1));

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredViewerTest.java
deleted file mode 100644
index 0b2672c..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/StructuredViewerTest.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import junit.framework.*;

-import org.eclipse.jface.*;

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

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

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

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

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

-import java.util.*;

-

-public abstract class StructuredViewerTest extends TestCase {

-	Display fDisplay;

-	Shell fShell;

-	StructuredViewer fViewer;

-	TestElement fRootElement;

-

-	public static class TestLabelFilter extends ViewerFilter {

-		public boolean select(Viewer viewer, Object parent, Object element) {

-			String label = ((TestElement) element).getLabel();

-			int count = label.indexOf("-");

-			if (count < 0)

-				return false;

-			String number = label.substring(count + 1);

-			return ((Integer.parseInt(number) % 2) == 0);

-		}

-		public boolean isFilterProperty(Object element, String property) {

-			return property.equals(IBasicPropertyConstants.P_TEXT);

-		}

-	};

-

-	public static class TestLabelSorter extends ViewerSorter {

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

-			// put greater labels first

-			String name1 = ((TestElement) e1).getLabel();

-			String name2 = ((TestElement) e2).getLabel();

-			return name2.compareTo(name1);

-		}

-		public boolean isSorterProperty(Object element, String property) {

-			return property.equals(IBasicPropertyConstants.P_TEXT);

-		}

-	};

-

-	public static class TestLabelProvider extends LabelProvider {

-		public static String fgSuffix = "";

-

-		static Image fgImage = ImageDescriptor.createFromFile(TestLabelProvider.class, "images/java.gif").createImage();

-

-		public String getText(Object element) {

-			return providedString((TestElement) element);

-		}

-

-		public Image getImage(Object element) {

-			return fgImage;

-		}

-

-		public void setSuffix(String suffix) {

-			fgSuffix = suffix;

-			fireLabelProviderChanged(new LabelProviderChangedEvent(this));

-		}

-	};

-

-	public TestModel fModel;

-	public StructuredViewerTest(String name) {

-		super(name);

-	}

-protected void assertSelectionEquals(String message, TestElement expected) {

-	ISelection selection = fViewer.getSelection();

-	assertTrue(selection instanceof StructuredSelection);

-	StructuredSelection expectedSelection = new StructuredSelection(expected);

-	assertEquals("selections", selection, expectedSelection);

-}

-protected void bulkChange(TestModelChange eventToFire) {

-	TestElement first = fRootElement.getFirstChild();

-	TestElement newElement = first.getContainer().basicAddChild();

-	fRootElement.basicDeleteChild(first);

-	fModel.fireModelChanged(eventToFire);

-	assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-	assertNull("first child is not visible", fViewer.testFindItem(first));

-}

-/**

- * Creates the viewer used by this test, under the given parent widget.

- */

-protected abstract StructuredViewer createViewer(Composite parent);

-	protected abstract int getItemCount();

-	protected abstract String getItemText(int at);

-	/**

-	 * Interacts with a test set up. Call this method from your

-	 * test when you want to interactively experiment with a set up.

-	 * The interaction terminates when the browser is closed.

-	 */

-	public void interact() {

-		Shell shell= fShell;

-		if (shell != null && !shell.isDisposed()) {

-			Display display= shell.getDisplay();

-			if (display != null) {

-				while (shell.isVisible()) 

-					display.readAndDispatch();

-			}

-		}	

-	}

-	protected void openBrowser() {

-		Display display = Display.getCurrent();

-		if (display != null)

-			display.dispose();

-		fDisplay = new Display();

-		fShell = new Shell(fDisplay);

-		fShell.setSize(500, 500);

-		fShell.setLayout(new FillLayout());

-		fViewer = createViewer(fShell);

-		fViewer.setUseHashlookup(true);

-		fViewer.setInput(fRootElement);

-		fShell.open();

-		//processEvents();

-	}

-public void processEvents() {

-	Shell shell = fShell;

-	if (shell != null && !shell.isDisposed()) {

-		Display display = shell.getDisplay();

-		if (display != null) {

-			while (display.readAndDispatch())

-				;

-		}

-	}

-}

-	public static String providedString(String s) {

-		return s+"<rendered>"+TestLabelProvider.fgSuffix;

-	}

-	public static String providedString(TestElement element) {

-		return element.getID()+" "+element.getLabel()+"<rendered>"+TestLabelProvider.fgSuffix;

-	}

-	public void setUp() {

-		fRootElement= TestElement.createModel(3, 10);

-		fModel= fRootElement.getModel();

-		openBrowser();

-	}

-	/**

-	 * Sleeps for the given duration and processes pending

-	 * events. Call this method to temporarily suspend a test

-	 * see the current state in the browser.

-	 */

-	void sleep(int d) {

-		processEvents();

-		try {

-			Thread.currentThread().sleep(d*1000);

-		} catch(Exception e) {}

-	}

-public void tearDown() {

-	processEvents();

-	fViewer = null;

-	fDisplay.dispose();

-	fDisplay = null;

-	fRootElement = null;

-}

-	public void testClearSelection() {

-		TestElement first= fRootElement.getFirstChild();

-		StructuredSelection selection= new StructuredSelection(first);

-		fViewer.setSelection(selection);

-		fViewer.setSelection(new StructuredSelection());

-		ISelection result= fViewer.getSelection();

-		assertTrue(result.isEmpty());

-	}

-	public void testDeleteChild() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement first2= first.getFirstChild();

-		first.deleteChild(first2);

-		assertNull("first child is not visible", fViewer.testFindItem(first2));

-	}

-	public void testDeleteInput() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement firstfirst= first.getFirstChild();

-		fViewer.setInput(first);

-		fRootElement.deleteChild(first);

-		assertNull("first child is not visible", fViewer.testFindItem(firstfirst));	

-	}

-	public void testDeleteSibling() {

-		TestElement first= fRootElement.getFirstChild();

-		assertNotNull("first child is visible", fViewer.testFindItem(first));		

-		fRootElement.deleteChild(first);

-		assertNull("first child is not visible", fViewer.testFindItem(first));

-	}

-	public void testFilter() {

-		ViewerFilter filter= new TestLabelFilter(); 

-		fViewer.addFilter(filter);

-		assertTrue("filtered count", getItemCount() == 5);

-		fViewer.removeFilter(filter);

-		assertTrue("unfiltered count", getItemCount() == 10);

-

-	}

-	public void testInsertChild() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement newElement= first.addChild(TestModelChange.INSERT);

-		assertNull("new sibling is not visible", fViewer.testFindItem(newElement));

-	}

-	public void testInsertSibling() {

-		TestElement newElement= fRootElement.addChild(TestModelChange.INSERT);

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-	}

-	public void testInsertSiblingReveal() {

-		TestElement newElement= fRootElement.addChild(TestModelChange.INSERT | TestModelChange.REVEAL);

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-	}

-	public void testInsertSiblings() {

-		TestElement[] newElements = fRootElement.addChildren(TestModelChange.INSERT);

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

-			assertNotNull("new siblings are visible", fViewer.testFindItem(newElements[i]));

-	}

-	public void testInsertSiblingSelectExpanded() {

-		TestElement newElement= fRootElement.addChild(TestModelChange.INSERT | TestModelChange.REVEAL | TestModelChange.SELECT);

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-		assertSelectionEquals("new element is selected", newElement);

-	}

-	public void testInsertSiblingWithFilterFiltered() {

-		fViewer.addFilter(new TestLabelFilter());

-		TestElement newElement= new TestElement(fModel, fRootElement);

-		newElement.setLabel("name-111");

-		fRootElement.addChild(newElement, 

-			new TestModelChange(TestModelChange.INSERT | TestModelChange.REVEAL | TestModelChange.SELECT, fRootElement, newElement)

-		);

-		assertNull("new sibling is not visible", fViewer.testFindItem(newElement));

-		assertTrue(getItemCount() == 5);

-	}

-	public void testInsertSiblingWithFilterNotFiltered() {

-		fViewer.addFilter(new TestLabelFilter());

-		TestElement newElement= new TestElement(fModel, fRootElement);

-		newElement.setLabel("name-222");

-		fRootElement.addChild(newElement, 

-			new TestModelChange(TestModelChange.INSERT | TestModelChange.REVEAL | TestModelChange.SELECT, fRootElement, newElement)

-		);

-		assertNotNull("new sibling is visible", fViewer.testFindItem(newElement));

-		assertTrue(getItemCount() == 6);

-	}

-	public void testInsertSiblingWithSorter() {

-		fViewer.setSorter(new TestLabelSorter());

-		TestElement newElement= new TestElement(fModel, fRootElement);

-		newElement.setLabel("name-9999");

-		fRootElement.addChild(newElement, 

-			new TestModelChange(TestModelChange.INSERT |TestModelChange.REVEAL | TestModelChange.SELECT, fRootElement, newElement)

-		);

-		String newLabel= newElement.toString();

-		assertEquals("sorted first", newLabel, getItemText(0));

-		assertSelectionEquals("new element is selected", newElement);

-	}

-	public void testLabelProvider() {

-		// BUG: non-polymorphic behaviour

-		// if (fViewer instanceof TableViewer || fViewer instanceof TableTreeViewer)

-		// 	return;

-		fViewer.setLabelProvider(new TestLabelProvider());

-		TestElement first= fRootElement.getFirstChild();

-		String newLabel= providedString(first);

-		assertEquals("rendered label", newLabel, getItemText(0));

-	}

-	public void testLabelProviderStateChange() {

-		// BUG: non-polymorphic behaviour

-		// if (fViewer instanceof TableViewer || fViewer instanceof TableTreeViewer)

-		// 	return;

-		TestLabelProvider provider= new TestLabelProvider();

-		fViewer.setLabelProvider(provider);

-		provider.setSuffix("added suffix");

-		TestElement first= fRootElement.getFirstChild();

-		String newLabel= providedString(first);

-		assertEquals("rendered label", newLabel, getItemText(0));

-	}

-	public void testRename() {

-		TestElement first= fRootElement.getFirstChild();

-		String newLabel= first.getLabel()+" changed";

-		first.setLabel(newLabel);

-		assertEquals("changed label", first.getID()+" "+newLabel, getItemText(0));

-	}

-	public void testRenameWithFilter() {

-		fViewer.addFilter(new TestLabelFilter());

-		TestElement first= fRootElement.getFirstChild();

-		first.setLabel("name-1111"); // should disappear

-		assertNull("changed sibling is not visible", fViewer.testFindItem(first));

-		first.setLabel("name-2222"); // should reappear

-		fViewer.refresh(); 

-		assertNotNull("changed sibling is not visible", fViewer.testFindItem(first));

-	}

-	public void testRenameWithLabelProvider() {

-		if (fViewer instanceof TableViewer || fViewer instanceof TableTreeViewer)

-			return;

-		fViewer.setLabelProvider(new TestLabelProvider());

-		TestElement first= fRootElement.getFirstChild();

-		first.setLabel("changed name");

-		String newLabel= providedString(first);

-		assertEquals("rendered label", newLabel, getItemText(0));

-	}

-	public void testRenameWithSorter() {

-		fViewer.setSorter(new TestLabelSorter());

-		TestElement first= fRootElement.getFirstChild();

-		first.setLabel("name-9999");

-		String newElementLabel= first.toString();

-		assertEquals("sorted first", newElementLabel, getItemText(0));

-	}

-	public void testSetInput() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement firstfirst= first.getFirstChild();

-

-		fViewer.setInput(first);

-		assertNotNull("first child is visible", fViewer.testFindItem(firstfirst));		

-	}

-	public void testSetSelection() {

-		TestElement first= fRootElement.getFirstChild();

-		StructuredSelection selection= new StructuredSelection(first);

-		fViewer.setSelection(selection);

-		IStructuredSelection result= (IStructuredSelection)fViewer.getSelection();

-		assertTrue(result.size() == 1);

-		assertTrue(result.getFirstElement() == first);

-	}

-	public void testSomeChildrenChanged() {

-		bulkChange(new TestModelChange(TestModelChange.STRUCTURE_CHANGE, fRootElement));

-	}

-	public void testSorter() {

-		TestElement first= fRootElement.getFirstChild();

-		TestElement last= fRootElement.getLastChild();

-		int size= fRootElement.getChildCount();

-		

-		String firstLabel= first.toString();

-		String lastLabel= last.toString();

-		assertEquals("unsorted", firstLabel, getItemText(0));

-		assertEquals("unsorted", lastLabel, getItemText(size-1));

-		fViewer.setSorter(new TestLabelSorter());

-		assertEquals("reverse sorted", firstLabel, getItemText(size-1));

-		assertEquals("reverse sorted", lastLabel, getItemText(0));

-		

-		fViewer.setSorter(null);

-		assertEquals("unsorted", firstLabel, getItemText(0));

-		assertEquals("unsorted", lastLabel, getItemText(size-1));		

-	}

-	public void testWorldChanged() {

-		bulkChange(new TestModelChange(TestModelChange.STRUCTURE_CHANGE, null));

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableTreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableTreeViewerTest.java
deleted file mode 100644
index aa297ac..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableTreeViewerTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

-import org.eclipse.swt.SWT;

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

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

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

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

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

-import java.util.*;

-import junit.framework.*;

-

-public class TableTreeViewerTest extends AbstractTreeViewerTest {

-

-public static class TableTreeTestLabelProvider

-	extends TestLabelProvider

-	implements ITableLabelProvider {

-	public boolean fExtended = false;

-

-	public String getText(Object element) {

-		if (fExtended)

-			return providedString((String) element);

-

-		return element.toString();

-	}

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

-		if (fExtended)

-			return providedString((TestElement)element);

-		return element.toString();

-	}

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

-		return null;

-	}

-}

-

-	public TableTreeViewerTest(String name) {

-		super(name);

-	}

-protected StructuredViewer createViewer(Composite parent) {

-	TableTreeViewer viewer = new TableTreeViewer(parent);

-	viewer.setContentProvider(new TestModelContentProvider());

-	viewer.setLabelProvider(new TableTreeTestLabelProvider());

-	viewer.getTableTree().getTable().setLinesVisible(true);

-

-	TableLayout layout = new TableLayout();

-	viewer.getTableTree().getTable().setLayout(layout);

-	viewer.getTableTree().getTable().setHeaderVisible(true);

-	String headers[] = { "column 1 header", "column 2 header" };

-

-	ColumnLayoutData layouts[] =

-		{ new ColumnWeightData(100), new ColumnWeightData(100)};

-

-	final TableColumn columns[] = new TableColumn[headers.length];

-

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

-		layout.addColumnData(layouts[i]);

-		TableColumn tc = new TableColumn(viewer.getTableTree().getTable(), SWT.NONE, i);

-		tc.setResizable(layouts[i].resizable);

-		tc.setText(headers[i]);

-		columns[i] = tc;

-	}

-	fTreeViewer = viewer;

-	return viewer;

-}

-	protected int getItemCount() {

-		TestElement first = fRootElement.getFirstChild();

-		TableTreeItem ti = (TableTreeItem) fViewer.testFindItem(first);

-		TableTree table = ti.getParent();

-		return table.getItemCount();

-	}

-	protected int getItemCount(TestElement element) {

-		TableTreeItem ti = (TableTreeItem) fViewer.testFindItem(element);

-		return ti.getItemCount();

-	}

-	protected String getItemText(int at) {

-		TableTree table = (TableTree) fViewer.getControl();

-		return table.getItems()[at].getText();

-	}

-	public static void main(String args[]) {

-		junit.textui.TestRunner.run(TableTreeViewerTest.class);

-	}

-	public void testLabelProvider() {

-		TableTreeViewer viewer = (TableTreeViewer) fViewer;

-		TableTreeTestLabelProvider provider = (TableTreeTestLabelProvider) viewer.getLabelProvider();

-		provider.fExtended = true;

-		// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-		fViewer.refresh();

-		TestElement first = fRootElement.getFirstChild();

-		String newLabel = providedString(first);

-		assertEquals("rendered label", newLabel, getItemText(0));

-		provider.fExtended = false;

-		// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-		fViewer.refresh();

-	}

-	public void testLabelProviderStateChange() {

-		TableTreeViewer viewer = (TableTreeViewer) fViewer;

-		TableColumn column = viewer.getTableTree().getTable().getColumn(0);

-		TableTreeTestLabelProvider provider =

-			(TableTreeTestLabelProvider) viewer.getLabelProvider();

-		provider.fExtended = true;

-		provider.setSuffix("added suffix");

-		// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-		fViewer.refresh();

-		TestElement first = fRootElement.getFirstChild();

-		String newLabel = providedString(first);

-		assertEquals("rendered label", newLabel, getItemText(0));

-		provider.fExtended = false;

-		// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-		fViewer.refresh();

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerTest.java
deleted file mode 100644
index 5bcf815..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-import org.eclipse.jface.*;

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

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

-import org.eclipse.swt.SWT;

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

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

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

-import java.util.*;

-import junit.framework.*;

-

-public class TableViewerTest extends StructuredItemViewerTest {

-public static class TableTestLabelProvider

-	extends TestLabelProvider

-	implements ITableLabelProvider {

-	public boolean fExtended = false;

-

-	public String getText(Object element) {

-		if (fExtended)

-			return providedString((String) element);

-		return element.toString();

-	}

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

-		if (fExtended)

-			return providedString((TestElement) element);

-		return element.toString();

-	}

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

-		return null;

-	}

-}

-public TableViewerTest(String name) {

-	super(name);

-}

-/**

- * Creates the viewer used by this test, under the given parent widget.

- */

-protected StructuredViewer createViewer(Composite parent) {

-	TableViewer viewer = new TableViewer(parent);

-	viewer.setContentProvider(new TestModelContentProvider());

-	viewer.setLabelProvider(new TableTestLabelProvider());

-	viewer.getTable().setLinesVisible(true);

-

-	TableLayout layout = new TableLayout();

-	viewer.getTable().setLayout(layout);

-	viewer.getTable().setHeaderVisible(true);

-	String headers[] = { "column 1 header", "column 2 header" };

-

-	ColumnLayoutData layouts[] =

-		{ new ColumnWeightData(100), new ColumnWeightData(100)};

-

-	final TableColumn columns[] = new TableColumn[headers.length];

-

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

-		layout.addColumnData(layouts[i]);

-		TableColumn tc = new TableColumn(viewer.getTable(), SWT.NONE, i);

-		tc.setResizable(layouts[i].resizable);

-		tc.setText(headers[i]);

-		columns[i] = tc;

-	}

-

-	return viewer;

-}

-protected int getItemCount() {

-	TestElement first = fRootElement.getFirstChild();

-	TableItem ti = (TableItem) fViewer.testFindItem(first);

-	Table table = ti.getParent();

-	return table.getItemCount();

-}

-protected String getItemText(int at) {

-	Table table = (Table) fViewer.getControl();

-	return table.getItem(at).getText();

-}

-public static void main(String args[]) {

-	junit.textui.TestRunner.run(TableViewerTest.class);

-}

-public void testLabelProvider() {

-

-	TableViewer viewer = (TableViewer) fViewer;

-	TableTestLabelProvider provider = (TableTestLabelProvider) viewer.getLabelProvider();

-

-	provider.fExtended = true;

-	// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-	fViewer.refresh();

-	TestElement first = fRootElement.getFirstChild();

-	String newLabel = providedString(first);

-	assertEquals("rendered label", newLabel, getItemText(0));

-	provider.fExtended = false;

-	// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-}

-public void testLabelProviderStateChange() {

-	TableViewer tableviewer = (TableViewer) fViewer;

-	TableColumn column = tableviewer.getTable().getColumn(0);

-	TableTestLabelProvider provider = (TableTestLabelProvider) tableviewer.getLabelProvider();

-

-	provider.fExtended = true;

-	provider.setSuffix("added suffix");

-	// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-	tableviewer.refresh();

-	TestElement first = fRootElement.getFirstChild();

-	String newLabel = providedString(first);

-	assertEquals("rendered label", newLabel, getItemText(0));

-	provider.fExtended = false;

-	// BUG 1FZ5SDC: JFUIF:WINNT - TableViewerColumn should listen for LabelProvider changes

-	fViewer.refresh();

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestElement.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestElement.java
deleted file mode 100644
index 3eb6e37..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestElement.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import java.util.*;

-

-public class TestElement implements Cloneable {

-	TestModel fModel;

-	TestElement fContainer;

-	String fSomeName;

-	String fId;

-	Vector fChildren= new Vector();

-	boolean fIsDeleted= false;

-		

-	public static final String P_SOMENAME= "org.eclipse.jface.viewertest.name";

-	public static final String P_COLUMN_1= "org.eclipse.jface.viewertest.column1";

-	

-	

-public TestElement(TestModel model, TestElement container) {

-	fModel = model;

-	fContainer = container;

-	int p = 0;

-	TestElement lastSibling = container.getLastChild();

-	if (lastSibling != null) {

-	    p = lastSibling.childId() + 1;

-	}

-	fId = container.getID() + "-" + p;

-}

-public TestElement(TestModel model, TestElement container, int level, int position) {

-	fModel = model;

-	fContainer = container;

-	if (container != null)

-		fId = container.getID() + "-" + position;

-	else

-		fId = Integer.toString(position);

-	fSomeName = "name-" + position;

-

-	if (level < model.getNumLevels()) {

-		for (int i = 0; i < model.getNumChildren(); i++) {

-			fChildren.add(new TestElement(model, this, level + 1, i));

-		}

-	}

-}

-	public TestElement addChild(int event) {		

-		TestElement element= new TestElement(fModel, this);

-		element.fSomeName= "added";

-		addChild(element, new TestModelChange(event, this, element));

-		return element;

-	}

-	public TestElement addChild(TestElement element, TestModelChange change) {		

-		fChildren.add(element);

-		fModel.fireModelChanged(change);

-		return element;

-	}

-	public void addChildren(TestElement[] elements, TestModelChange change) {

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

-			fChildren.add(elements[i]);

-		fModel.fireModelChanged(change);

-	}

-	public TestElement[] addChildren(int event) {

-		TestElement elements[]= new TestElement[] {

-			new TestElement(fModel, this),

-			new TestElement(fModel, this)

-		};

-					

-		elements[0].fSomeName= "added1";

-		elements[1].fSomeName= "added2";

-		addChildren(elements, new TestModelChange(event, this, elements));

-		return elements;		

-	}

-	public TestElement basicAddChild() {		

-		TestElement element= new TestElement(fModel, this);

-		element.fSomeName= "added";

-		fChildren.add(element);

-		return element;

-	}

-	public void basicDeleteChild(TestElement element) {

-		fChildren.remove(element);

-		element.fIsDeleted= true;

-	}

-	private int childId() {

-		String id= fId.substring(fId.lastIndexOf("-")+1);

-		return Integer.parseInt(id);

-	}

-	public Object clone() {

-		try {

-			return super.clone();

-		}

-		catch (CloneNotSupportedException e) {

-			throw new Error(); // should not happen

-		}

-	}

-	static public TestElement createModel(int numLevels, int numChildren) {

-		return new TestElement(new TestModel(numLevels, numChildren), null, 0, 0);

-	}

-	public void deleteChild(TestElement element) {

-		deleteChild(element, new TestModelChange(TestModelChange.REMOVE, this, element));

-	}

-	public void deleteChild(TestElement element, TestModelChange change) {

-		basicDeleteChild(element);

-		fModel.fireModelChanged(change);

-	}

-public void deleteChildren() {

-	for (int i = fChildren.size() - 1; i >= 0; i--) {

-		TestElement te = (TestElement) fChildren.elementAt(i);

-		fChildren.remove(te);

-		te.fIsDeleted = true;

-	}

-	fModel.fireModelChanged(new TestModelChange(TestModelChange.STRUCTURE_CHANGE, this));

-}

-public void deleteSomeChildren() {

-	for (int i = fChildren.size() - 1; i >= 0; i -= 2) {

-		TestElement te = (TestElement) fChildren.elementAt(i);

-		fChildren.remove(te);

-		te.fIsDeleted = true;

-	}

-	fModel.fireModelChanged(new TestModelChange(TestModelChange.STRUCTURE_CHANGE, this));

-}

-	public boolean equals(Object arg) {

-		if (!(arg instanceof TestElement))

-			return false;

-		TestElement element= (TestElement)arg;

-		return element.fId.equals(fId);

-	}

-	public TestElement getChildAt(int i) {

-		return (TestElement) fChildren.elementAt(i);

-	}

-	public int getChildCount() {

-		return fChildren.size();

-	}

-	public TestElement getContainer() {

-		return fContainer;

-	}

-	public TestElement getFirstChild() {

-		if (fChildren.size() > 0)

-			return (TestElement)fChildren.elementAt(0);

-		return null;

-	}

-	public String getID() {

-		return fId;

-	}

-	public String getLabel() {

-		return fSomeName;

-	}

-public TestElement getLastChild() {

-	int size = fChildren.size();

-	if (size > 0)

-		return (TestElement) fChildren.elementAt(size - 1);

-	return null;

-}

-public TestModel getModel() {

-	return fModel;

-}

-	public int hashCode() {

-		return fId.hashCode();

-	}

-public boolean isDeleted() {

-	return fIsDeleted;

-}

-	public void setLabel(String label) {

-		fSomeName= label;

-		fModel.fireModelChanged(new TestModelChange(TestModelChange.NON_STRUCTURE_CHANGE, this));

-	}

-	public boolean testDeleted() {

-		if (fIsDeleted)

-			return true;

-		if (fContainer != null)

-			return fContainer.testDeleted();

-		return false;

-	}

-public String toString() {

-	return getID() + " " + getLabel();

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestLabelProvider.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestLabelProvider.java
deleted file mode 100644
index 8c08a08..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestLabelProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

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

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

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

-

-public class TestLabelProvider extends LabelProvider {

-	

-	static Image fgImage= null;

-	

-/**

- *

- */

-public static Image getImage() {

-	if (fgImage == null)

-		fgImage = ImageDescriptor.createFromFile(TestLabelProvider.class, "images/java.gif").createImage();

-	return fgImage;

-}

-	public Image getImage(Object element) {

-		return getImage();

-	}

-	public String getText(Object element) {

-		String label= element.toString();

-		return label+ " <rendered>";

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModel.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModel.java
deleted file mode 100644
index 7d0ba3f..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-import java.util.*;

-

-public class TestModel {

-	Vector fListeners = new Vector();

-	int fNumLevels;

-	int fNumChildren;

-public TestModel(int numLevels, int numChildren) {

-	fNumLevels = numLevels;

-	fNumChildren = numChildren;

-}

-public void addListener(ITestModelListener listener) {

-	fListeners.addElement(listener);

-}

-/**

- * Fires a model changed event to all listeners.

- */

-public void fireModelChanged(TestModelChange change) {

-	for (int i = 0; i < fListeners.size(); ++i) {

-		ITestModelListener listener = (ITestModelListener) fListeners.get(i);

-		listener.testModelChanged(change);

-	}

-}

-public int getNumChildren() {

-	return fNumChildren;

-}

-public int getNumLevels() {

-	return fNumLevels;

-}

-public void removeListener(ITestModelListener listener) {

-	fListeners.removeElement(listener);

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelChange.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelChange.java
deleted file mode 100644
index e6f4ea1..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelChange.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-public class TestModelChange {

-	private int fKind;

-	private TestElement fParent;

-	private TestElement[] fChildren;

-

-	public static final int KIND_MASK = 0x0F;

-

-	public static final int INSERT = 1;

-	public static final int REMOVE = 2;

-	public static final int STRUCTURE_CHANGE = 3;

-	public static final int NON_STRUCTURE_CHANGE = 4;

-

-	public static final int REVEAL = 16;

-	public static final int SELECT = 32;

-	

-public TestModelChange(int kind, TestElement parent) {

-	this(kind, parent, new TestElement[0]);

-}

-public TestModelChange(int kind, TestElement parent, TestElement[] children) {

-	fKind = kind;

-	fParent = parent;

-	fChildren = children;

-}

-public TestModelChange(int kind, TestElement parent, TestElement child) {

-	this(kind, parent, new TestElement[] { child });

-}

-public TestElement[] getChildren() {

-	return fChildren;

-}

-public int getKind() {

-	return fKind & KIND_MASK;

-}

-public int getModifiers() {

-	return fKind & ~KIND_MASK;

-}

-public TestElement getParent() {

-	return fParent;

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelContentProvider.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelContentProvider.java
deleted file mode 100644
index 5bcfd3b..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TestModelContentProvider.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-import org.eclipse.jface.*;

-import org.eclipse.jface.util.Assert;

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

-import java.util.*;

-

-public class TestModelContentProvider implements ITestModelListener, IStructuredContentProvider, ITreeContentProvider {

-	Viewer fViewer;

-public void dispose() {

-}

-protected void doInsert(TestModelChange change) {

-	if (fViewer instanceof ListViewer) {

-		if (change.getParent() != null && change.getParent().equals(fViewer.getInput())) {

-			((ListViewer) fViewer).add(change.getChildren());

-		}

-	}

-	else if (fViewer instanceof TableViewer) {

-		if (change.getParent() != null && change.getParent().equals(fViewer.getInput())) {

-			((TableViewer) fViewer).add(change.getChildren());

-		}

-	}

-	else if (fViewer instanceof AbstractTreeViewer) {

-		((AbstractTreeViewer) fViewer).add(change.getParent(), change.getChildren());

-	}

-	else {

-		Assert.isTrue(false, "Unknown kind of viewer");

-	}

-}

-protected void doNonStructureChange(TestModelChange change) {

-	if (fViewer instanceof StructuredViewer) {

-		((StructuredViewer) fViewer).update(change.getParent(), new String[] { IBasicPropertyConstants.P_TEXT });

-	}

-	else {

-		Assert.isTrue(false, "Unknown kind of viewer");

-	}

-}

-protected void doRemove(TestModelChange change) {

-	if (fViewer instanceof ListViewer) {

-		((ListViewer) fViewer).remove(change.getChildren());

-	}

-	else if (fViewer instanceof TableViewer) {

-		((TableViewer) fViewer).remove(change.getChildren());

-	}

-	else if (fViewer instanceof AbstractTreeViewer) {

-		((AbstractTreeViewer) fViewer).remove(change.getChildren());

-	}

-	else {

-		Assert.isTrue(false, "Unknown kind of viewer");

-	}

-}

-protected void doStructureChange(TestModelChange change) {

-	if (fViewer instanceof StructuredViewer) {

-		((StructuredViewer) fViewer).refresh(change.getParent());

-	}

-	else {

-		Assert.isTrue(false, "Unknown kind of viewer");

-	}

-}

-public Object[] getChildren(Object element) {

-	TestElement testElement = (TestElement) element;

-	int count = testElement.getChildCount();

-	TestElement[] children = new TestElement[count];

-	for (int i = 0; i < count; ++i)

-		children[i] = testElement.getChildAt(i);

-	return children;

-}

-public Object[] getElements(Object element) {

-	return getChildren(element);

-}

-public Object getParent(Object element) {

-	return ((TestElement) element).getContainer();

-}

-public boolean hasChildren(Object element) {

-	return ((TestElement) element).getChildCount() > 0;

-}

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

-	fViewer = viewer;

-	TestElement oldElement = (TestElement) oldInput;

-	if (oldElement != null) {

-		oldElement.getModel().removeListener(this);

-	}

-	TestElement newElement = (TestElement) newInput;

-	if (newElement != null) {

-		newElement.getModel().addListener(this);

-	}

-}

-public boolean isDeleted(Object element) {

-	return ((TestElement) element).isDeleted();

-}

-public void testModelChanged(TestModelChange change) {

-	switch (change.getKind()) {

-		case TestModelChange.INSERT:

-			doInsert(change);

-			break;

-		case TestModelChange.REMOVE:

-			doRemove(change);

-			break;

-		case TestModelChange.STRUCTURE_CHANGE:

-			doStructureChange(change);

-			break;

-		case TestModelChange.NON_STRUCTURE_CHANGE:

-			doNonStructureChange(change);

-			break;

-		default:

-			throw new IllegalArgumentException("Unknown kind of change");

-	}

-	

-	StructuredSelection selection = new StructuredSelection(change.getChildren());

-	if ((change.getModifiers() & TestModelChange.SELECT) != 0) {

-		((StructuredViewer) fViewer).setSelection(selection);

-	}

-	if ((change.getModifiers() & TestModelChange.REVEAL) != 0) {

-		Object element = selection.getFirstElement();

-		if (element != null) {

-			((StructuredViewer) fViewer).reveal(element);

-		}

-	}

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TreeViewerTest.java
deleted file mode 100644
index d178601..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TreeViewerTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jface.tests.viewers;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-import org.eclipse.jface.*;

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

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

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

-import junit.framework.*;

-

-public class TreeViewerTest extends AbstractTreeViewerTest {

-			

-	public TreeViewerTest(String name) {

-		super(name);

-	}

-	protected StructuredViewer createViewer(Composite parent) {

-		fTreeViewer= new TreeViewer(parent);

-		fTreeViewer.setContentProvider(new TestModelContentProvider());

-		return fTreeViewer;

-	}

-	protected int getItemCount() {

-		TestElement first= fRootElement.getFirstChild();

-		TreeItem ti= (TreeItem)fViewer.testFindItem(first);

-		Tree tree= ti.getParent();		

-		return tree.getItemCount();

-	}

-/**

- * getItemCount method comment.

- */

-protected int getItemCount(TestElement element) {

-	return 0;

-}

-	protected String getItemText(int at) {

-		Tree tree= (Tree) fTreeViewer.getControl();

-		return tree.getItems()[at].getText();

-	}

-	public static void main(String args[]) {

-		junit.textui.TestRunner.run(TreeViewerTest.class);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddChildAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddChildAction.java
deleted file mode 100644
index ecfa1f4..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddChildAction.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

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

-

-public class AddChildAction extends TestSelectionAction {

-			

-	int fEventKind;

-	

-	public AddChildAction(String label, TestBrowser browser) {

-		this(label, browser, TestModelChange.INSERT);

-	}

-	public AddChildAction(String label, TestBrowser browser, int eventKind) {

-		super(label, browser);

-		fEventKind= eventKind;

-	}

-	public void run(TestElement element) {

-		element.addChild(fEventKind);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddElementAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddElementAction.java
deleted file mode 100644
index 4ea9c83..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddElementAction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

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

-

-public class AddElementAction extends TestBrowserAction {

-	

-	public AddElementAction(String label, TestBrowser browser) {

-		super(label, browser);

-//		window.addFocusChangedListener(this);

-	}

-	public void run() {

-		TestElement element = (TestElement) getBrowser().getViewer().getInput();

-		element.addChild(TestModelChange.INSERT);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddFilterAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddFilterAction.java
deleted file mode 100644
index 621d839..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddFilterAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class AddFilterAction extends TestBrowserAction {

-

-	public AddFilterAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		Viewer viewer = getBrowser().getViewer();

-		if (viewer instanceof StructuredViewer)

-			((StructuredViewer) viewer).addFilter(new Filter());

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddSiblingAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddSiblingAction.java
deleted file mode 100644
index f45fb56..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/AddSiblingAction.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

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

-

-public class AddSiblingAction extends TestSelectionAction {

-	

-	int fEventKind;

-	

-	public AddSiblingAction(String label, TestBrowser browser) {

-		this(label, browser, TestModelChange.INSERT);

-	}

-	public AddSiblingAction(String label, TestBrowser browser, int eventKind) {

-		super(label, browser);

-		fEventKind= eventKind;

-	}

-	public void run(TestElement element) {

-		element.getContainer().addChild(fEventKind);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeChildLabelAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeChildLabelAction.java
deleted file mode 100644
index ed1e2dc..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeChildLabelAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class ChangeChildLabelAction extends TestSelectionAction {

-	public ChangeChildLabelAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run(TestElement element) {

-		TestElement child= element.getFirstChild();

-		if (child != null)

-			child.setLabel(child.getLabel() + " renamed child");

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeInputLabelAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeInputLabelAction.java
deleted file mode 100644
index 435c0cf..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeInputLabelAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class ChangeInputLabelAction extends TestBrowserAction {

-

-	public ChangeInputLabelAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-public void run() {

-	TestElement element = (TestElement) getBrowser().getInput();

-	element.setLabel(element.getLabel() + " changed");

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeLabelAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeLabelAction.java
deleted file mode 100644
index 5b989ed..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ChangeLabelAction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class ChangeLabelAction extends TestSelectionAction {

-

-	public ChangeLabelAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run(TestElement element) {

-		element.setLabel(element.getLabel() + " changed");

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ClearSelectionAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ClearSelectionAction.java
deleted file mode 100644
index 7b5d9db..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ClearSelectionAction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

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

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-public class ClearSelectionAction extends TestBrowserAction {

-

-	public ClearSelectionAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		getBrowser().getViewer().setSelection(new StructuredSelection());

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/CreateModelAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/CreateModelAction.java
deleted file mode 100644
index abfe539..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/CreateModelAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class CreateModelAction extends TestBrowserAction {

-	int fLevel;

-	int fChildCount;

-	public CreateModelAction(String label, TestBrowser browser, int level, int childCount) {

-		super(label, browser);

-		fLevel= level;

-		fChildCount= childCount;

-	}

-	public void run() {

-		// Clear input since TestElement.equals does only

-		// check the id, not the size of the TestElement.

-		getBrowser().setInput(null);

-		getBrowser().setInput(TestElement.createModel(fLevel, fChildCount));

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteAction.java
deleted file mode 100644
index 471d9d7..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteAction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class DeleteAction extends TestSelectionAction {

-

-	public DeleteAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run(TestElement element) {

-		element.getContainer().deleteChild(element);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteChildrenAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteChildrenAction.java
deleted file mode 100644
index 371fe05..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteChildrenAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class DeleteChildrenAction extends TestSelectionAction {

-

-	boolean fAll= false;

-	

-	public DeleteChildrenAction(String label, TestBrowser browser, boolean all) {

-		super(label, browser);

-		fAll= all;

-	}

-	public void run(TestElement element) {

-		if (fAll)

-			element.deleteChildren();

-		else

-			element.deleteSomeChildren();

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteSiblingsAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteSiblingsAction.java
deleted file mode 100644
index d5be41c..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/DeleteSiblingsAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class DeleteSiblingsAction extends TestSelectionAction {

-

-	boolean fAll= false;

-	

-	public DeleteSiblingsAction(String label, TestBrowser browser, boolean all) {

-		super(label, browser);

-		fAll= all;

-	}

-	public void run(TestElement element) {

-		if (fAll)

-			element.getContainer().deleteChildren();

-		else

-			element.getContainer().deleteSomeChildren();

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ExpandAllAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ExpandAllAction.java
deleted file mode 100644
index 116ee33..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ExpandAllAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-

-public class ExpandAllAction extends TestBrowserAction {

-

-	public ExpandAllAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		Viewer viewer = getBrowser().getViewer();

-		if (viewer instanceof AbstractTreeViewer)

-			((AbstractTreeViewer) viewer).expandAll();

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Filter.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Filter.java
deleted file mode 100644
index f705ed9..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Filter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

-import java.util.*;

-

-public class Filter extends ViewerFilter {

-

-	public Object[] filter(Viewer viewer, Object parent, Object[] elements) {

-		ArrayList result = new ArrayList();

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

-			 // toss every second item

-			if (i % 2 == 1) {

-				result.add(elements[i]);

-			}

-		}

-		return result.toArray();

-	}

-	public boolean isFilterProperty(Object element, Object aspect) {

-		return false;

-	}

-/* (non-Javadoc)

- * Method declared on ViewerFilter

- */

-public boolean select(Viewer viewer, Object parentElement, Object element) {

-	// not used

-	return false;

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/FlushInputAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/FlushInputAction.java
deleted file mode 100644
index f9ce336..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/FlushInputAction.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-public class FlushInputAction extends TestBrowserAction {

-

-	public FlushInputAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		getBrowser().setInput(null);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetFilterAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetFilterAction.java
deleted file mode 100644
index 7a318df..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetFilterAction.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

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

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-public class ResetFilterAction extends TestBrowserAction {

-

-	public ResetFilterAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		Viewer viewer = getBrowser().getViewer();

-		if (viewer instanceof StructuredViewer) {

-			StructuredViewer v = (StructuredViewer) viewer;

-			v.resetFilters();

-		}	

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetSorterAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetSorterAction.java
deleted file mode 100644
index f19a86d..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/ResetSorterAction.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

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

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-public class ResetSorterAction extends TestBrowserAction {

-

-	public ResetSorterAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		Viewer viewer = getBrowser().getViewer();

-		if (viewer instanceof StructuredViewer) {

-			StructuredViewer v = (StructuredViewer) viewer;

-			v.setSorter(null);

-		}	

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetLabelProviderAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetLabelProviderAction.java
deleted file mode 100644
index 1333cfb..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetLabelProviderAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

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

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

- 

-public class SetLabelProviderAction extends TestBrowserAction {

-

-	public SetLabelProviderAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		((ContentViewer) getBrowser().getViewer()).setLabelProvider(new TestLabelProvider());

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetSorterAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetSorterAction.java
deleted file mode 100644
index 594ee5b..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/SetSorterAction.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

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

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-public class SetSorterAction extends TestBrowserAction {

-

-	public SetSorterAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		Viewer viewer = getBrowser().getViewer();

-		if (viewer instanceof StructuredViewer) {

-			StructuredViewer v = (StructuredViewer) viewer;

-			v.setSorter(new Sorter());

-		}	

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Sorter.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Sorter.java
deleted file mode 100644
index effca75..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/Sorter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

-

-public class Sorter extends ViewerSorter {

-

-	public boolean isSorterProperty(Object element, String property) {

-		return IBasicPropertyConstants.P_TEXT.equals(property);

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowser.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowser.java
deleted file mode 100644
index 40896c7..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowser.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

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

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.swt.*;

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

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

-import org.eclipse.jface.*;

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

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

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

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

-import java.util.*;

-

-public abstract class TestBrowser extends ApplicationWindow {

-	TestElement fInput;

-	Viewer fViewer;

-	

-	Action fChangeLabelAction;

-	Action fChangeInputLabelAction;

-	Action fChangeChildLabelAction;

-	Action fReloadAction;

-	Action fReloadActionLarge;

-	Action fReloadActionFlat;

-	

-	Action fDeleteAction;

-	Action fDeleteChildrenAction;

-	Action fDeleteSomeChildrenAction;

-	Action fDeleteSiblingsAction;

-	Action fFlushInputAction;

-	

-	Action fAddElementAction;

-

-	Action fAddSiblingAction;

-	Action fAddSiblingRevealAction;

-	Action fAddSiblingSelectAction;

-	

-	Action fAddChildAction;

-	Action fAddChildRevealAction;

-	Action fAddChildSelectAction;

-

-	Action fWorldChangedAction;

-	

-	Action fSetLabelProvider;

-	

-	Action fAddFilterAction;

-	Action fResetFilters;

-	

-	Action fSetSorter;

-	Action fResetSorter;

-	

-	Action fClearSelection;

-	

-	int fPanes= 1;

-	

-	public TestBrowser() {

-		super(null);

-		addMenuBar();

-	}

-/* (non-Javadoc)

- * Method declared on Window.

- */

-protected void configureShell(Shell shell) {

-	super.configureShell(shell);

-	shell.setText("Test Browser");

-}

-protected void createActions() {

-	fChangeLabelAction = new ChangeLabelAction("Change Label", this);

-	fChangeChildLabelAction =

-		new ChangeChildLabelAction("Change Child Label", this);

-//	fChangeInputLabelAction =

-//		new ChangeInputLabelAction("Change Input Label", this);

-

-	fReloadAction = new CreateModelAction("Reload Test Data (small)", this, 3, 10);

-	fReloadActionLarge =

-		new CreateModelAction("Reload Test Data (large)", this, 3, 33);

-	fReloadActionFlat =

-		new CreateModelAction("Reload Test Data (flat)", this, 1, 2000);

-

-	fDeleteAction = new DeleteAction("Delete", this);

-	fDeleteChildrenAction = new DeleteChildrenAction("Delete Children", this, true);

-	fDeleteSomeChildrenAction =

-		new DeleteChildrenAction("Delete Odd Children", this, false);

-	fDeleteSiblingsAction = new DeleteSiblingsAction("Delete Siblings", this, true);

-

-	fFlushInputAction = new FlushInputAction("Flush Input", this);

-

-	fAddElementAction = new AddElementAction("Add Element to Input", this);

-	fAddSiblingAction = new AddSiblingAction("Add Sibling", this);

-	fAddSiblingRevealAction =

-		new AddSiblingAction(

-			"Add Sibling and Reveal",

-			this,

-			TestModelChange.INSERT | TestModelChange.REVEAL);

-	fAddSiblingSelectAction =

-		new AddSiblingAction(

-			"Add Sibling and Select",

-			this,

-			TestModelChange.INSERT | TestModelChange.REVEAL | TestModelChange.SELECT);

-	fAddChildAction = new AddChildAction("Add Child", this);

-	fAddChildRevealAction =

-		new AddChildAction(

-			"Add Child and Reveal",

-			this,

-			TestModelChange.INSERT | TestModelChange.REVEAL);

-	fAddChildSelectAction =

-		new AddChildAction(

-			"Add Child and Select",

-			this,

-			TestModelChange.INSERT | TestModelChange.REVEAL | TestModelChange.SELECT);

-

-	fWorldChangedAction = new WorldChangedAction("World Changed", this);

-

-	fSetLabelProvider =

-		new SetLabelProviderAction("Set Custom Label Provider", this);

-

-	fAddFilterAction = new AddFilterAction("Add Filter", this);

-	fResetFilters = new ResetFilterAction("Reset All Filters", this);

-

-	fSetSorter = new SetSorterAction("Set Sorter", this);

-	fResetSorter = new ResetSorterAction("Reset Sorter", this);

-

-	fClearSelection = new ClearSelectionAction("Clear Selection", this);

-}

-protected Control createContents() {

-	Shell shell = getShell();

-	ViewForm form = new ViewForm(shell, SWT.NONE);

-	CLabel label = new CLabel(form, SWT.NONE);

-	form.setTopLeft(label);

-	Object input = getInput();

-	label.setText(input.toString());

-	if (fPanes == 1) {

-		Viewer viewer = createViewer(form);

-		form.setContent(viewer.getControl());

-		fViewer = viewer;

-		viewer.setInput(input);

-	} else if (fPanes == 2) {

-		SashForm sashForm = new SashForm(form, SWT.VERTICAL);

-		form.setContent(sashForm);

-		Viewer viewer = createViewer(sashForm);

-		fViewer = viewer;

-		viewer.setInput(input);

-		viewer = createViewer(sashForm);

-		viewer.setInput(input);

-	}

-	createActions();

-	fillMenuBar(getMenuBarManager());

-	viewerFillMenuBar(getMenuBarManager());

-	getMenuBarManager().updateAll(false);

-	return form;

-}

-protected Control createContents(Composite parent) {

-	ViewForm form = new ViewForm(parent, SWT.NONE);

-	CLabel label = new CLabel(form, SWT.NONE);

-	form.setTopLeft(label);

-	Object input = getInput();

-	label.setText(input.toString());

-	if (fPanes == 1) {

-		Viewer viewer = createViewer(form);

-		form.setContent(viewer.getControl());

-		fViewer = viewer;

-		viewer.setInput(input);

-	} else if (fPanes == 2) {

-		SashForm sashForm = new SashForm(form, SWT.VERTICAL);

-		form.setContent(sashForm);

-		Viewer viewer = createViewer(sashForm);

-		fViewer = viewer;

-		viewer.setInput(input);

-		viewer = createViewer(sashForm);

-		viewer.setInput(input);

-	}

-	createActions();

-	fillMenuBar(getMenuBarManager());

-	viewerFillMenuBar(getMenuBarManager());

-	getMenuBarManager().updateAll(false);

-	return form;

-}

-	public abstract Viewer createViewer(Composite parent);

-protected void fillMenuBar(MenuManager mgr) {

-

-	MenuManager setupMenu = new MenuManager("Setup","Setup");

-	mgr.add(setupMenu);

-	setupMenu.add(fReloadAction);

-	setupMenu.add(fReloadActionLarge);

-	setupMenu.add(fReloadActionFlat);

-	setupMenu.add(new Separator());

-	setupMenu.add(fFlushInputAction);

-	setupMenu.add(new Separator());

-	setupMenu.add(fSetLabelProvider);

-	setupMenu.add(new Separator());

-	setupMenu.add(fAddFilterAction);

-	setupMenu.add(fResetFilters);

-	setupMenu.add(new Separator());

-	setupMenu.add(fSetSorter);

-	setupMenu.add(fResetSorter);

-

-	MenuManager testMenu = new MenuManager("Tests","Tests");

-	mgr.add(testMenu);

-	testMenu.add(fChangeLabelAction);

-	testMenu.add(fChangeChildLabelAction);

-//	testMenu.add(fChangeInputLabelAction);

-	testMenu.add(new Separator());

-

-	testMenu.add(fDeleteAction);

-	testMenu.add(fDeleteChildrenAction);

-	testMenu.add(fDeleteSomeChildrenAction);

-	testMenu.add(fDeleteSiblingsAction);

-	testMenu.add(new Separator());

-

-	testMenu.add(fAddElementAction);

-	testMenu.add(new Separator());

-

-	testMenu.add(fAddSiblingAction);

-	testMenu.add(fAddSiblingRevealAction);

-	testMenu.add(fAddSiblingSelectAction);

-	testMenu.add(new Separator());

-

-	testMenu.add(fAddChildAction);

-	testMenu.add(fAddChildRevealAction);

-	testMenu.add(fAddChildSelectAction);

-	testMenu.add(new Separator());

-

-	testMenu.add(fClearSelection);

-	testMenu.add(new Separator());

-

-	testMenu.add(fWorldChangedAction);

-//	((TestTree)this).testTreeFillMenuBar(testMenu);

-}

-public TestElement getInput() {

-	return fInput;

-}

-	public Viewer getViewer() {

-		return fViewer;

-	}

-	public Composite getViewerContainer() {

-		return null;

-	}

-public void open(TestElement input) {

-	setInput(input);

-	super.open();

-}

-public void setInput(TestElement input) {

-	fInput = input;

-	if (getViewer() != null)

-		getViewer().setInput(input);

-}

-	public void show2Panes() {

-		fPanes= 2;

-	}

-protected abstract void viewerFillMenuBar(MenuManager mgr);

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowserAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowserAction.java
deleted file mode 100644
index ad0d627..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestBrowserAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

-

-public abstract class TestBrowserAction extends Action {

-	private TestBrowser browser;

-	public TestBrowserAction(String label, TestBrowser browser) {

-		super(label);

-		this.browser = browser;

-	}

-	/**

-	 * Returns the test browser.

-	 */

-	public TestBrowser getBrowser() {

-		return browser;

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestCheckboxTree.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestCheckboxTree.java
deleted file mode 100644
index 9e81499..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestCheckboxTree.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

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

-import org.eclipse.swt.*;

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

-import java.util.*;

-

-public class TestCheckboxTree extends TestTree {

-	CheckboxTreeViewer fCheckboxViewer;

-

-	public TestCheckboxTree() {

-		super();

-	}

-public void checkChildren(TestElement element, boolean state) {

-	int numChildren = element.getChildCount();

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

-		TestElement child = element.getChildAt(i);

-		if (fCheckboxViewer.setChecked(child, state))

-			checkChildren(child, state);

-	}

-}

-public Viewer createViewer(Composite parent) {

-	CheckboxTreeViewer viewer = new CheckboxTreeViewer(parent);

-	viewer.setContentProvider(new TestModelContentProvider());

-	viewer.setLabelProvider(new TestLabelProvider());

-

-	viewer.addTreeListener(new ITreeViewerListener() {

-		public void treeExpanded(TreeExpansionEvent e) {

-			handleTreeExpanded((TestElement) e.getElement());

-		}

-		public void treeCollapsed(TreeExpansionEvent e) {

-		}

-	});

-

-	viewer.addCheckStateListener(new ICheckStateListener() {

-		public void checkStateChanged(CheckStateChangedEvent e) {

-			checkChildren((TestElement) e.getElement(), e.getChecked());

-		}

-	});

-

-	fCheckboxViewer = viewer;

-	fViewer = viewer;

-	return viewer;

-}

-	public void handleTreeExpanded(TestElement element) {

-		// apply the same check recursively to all children

-		boolean checked = fCheckboxViewer.getChecked(element);

-		int numChildren = element.getChildCount();

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

-			TestElement child= element.getChildAt(i);

-			fCheckboxViewer.setChecked(child, checked);

-		}

-	}

-public static void main(String[] args) {

-	TestBrowser browser = new TestCheckboxTree();

-	if (args.length > 0 && args[0].equals("-twopanes"))

-		browser.show2Panes();

-	browser.setBlockOnOpen(true);

-	browser.open(TestElement.createModel(3, 10));

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestList.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestList.java
deleted file mode 100644
index 524f7b6..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestList.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

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

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

-import java.util.*;

-

-public class TestList extends TestBrowser {

-	public Viewer createViewer(Composite parent) {

-		ListViewer viewer= new ListViewer(parent);

-		viewer.setUseHashlookup(true);

-		viewer.setContentProvider(new TestModelContentProvider());

-		return viewer;

-	}

-	public static void main(String[] args) {

-		TestList browser = new TestList();

-		browser.setBlockOnOpen(true);

-		browser.open(TestElement.createModel(3, 10));

-	}

-/**

- * 

- */

-protected void viewerFillMenuBar(MenuManager mgr) {

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestSelectionAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestSelectionAction.java
deleted file mode 100644
index df885be..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestSelectionAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

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

-import java.util.*;

-

-public abstract class TestSelectionAction extends TestBrowserAction implements ISelectionChangedListener {

-	public TestSelectionAction(String label, TestBrowser browser) {

-		super(label, browser);

-		browser.getViewer().addSelectionChangedListener(this);

-		setEnabled(false);

-	}

-	public TestElement getTestElement(ISelection selection) {

-		if (selection instanceof IStructuredSelection) {

-			return (TestElement) ((IStructuredSelection) selection).getFirstElement();

-		}

-		return null;

-	}

-/**

- * Overridden from Action.

- */

-public void run() {

-	TestElement testElement = getTestElement(getBrowser().getViewer().getSelection());

-	if (testElement != null) {

-		run(testElement);

-	}

-}

-	/**

-	 * The default implementation calls run(TestElement)

-	 * on every element contained in the vector.

-	 */

-	public void run(TestElement o) {

-	}

-	public void selectionChanged(SelectionChangedEvent event) {

-		setEnabled(!event.getSelection().isEmpty());

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTable.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTable.java
deleted file mode 100644
index b835492..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTable.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

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

-import org.eclipse.swt.*;

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

-import java.util.*;

-

-public class TestTable extends TestBrowser {

-

-public Viewer createViewer(Composite parent) {

-	TableViewer viewer = new TableViewer(parent);

-	viewer.setContentProvider(new TestModelContentProvider());

-	viewer.setLabelProvider(new TestLabelProvider());

-	viewer.getTable().setLinesVisible(true);

-

-	TableLayout layout = new TableLayout();

-	viewer.getTable().setLayout(layout);

-	viewer.getTable().setHeaderVisible(true);

-	String headers[] = { "Label Column", "Second Column" };

-

-	ColumnLayoutData layouts[] =

-		{ new ColumnWeightData(100, false), new ColumnWeightData(100, false)};

-

-	final TableColumn columns[] = new TableColumn[headers.length];

-

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

-		layout.addColumnData(layouts[i]);

-		TableColumn tc = new TableColumn(viewer.getTable(), SWT.NONE, i);

-		tc.setResizable(layouts[i].resizable);

-		tc.setText(headers[i]);

-		columns[i] = tc;

-	}

-

-	viewer.setUseHashlookup(true);

-

-	return viewer;

-}

-	public static void main(String[] args) {

-		TestTable browser = new TestTable();

-		browser.setBlockOnOpen(true);

-		browser.open(TestElement.createModel(3, 10));

-	}

-/**

- * 

- */

-protected void viewerFillMenuBar(MenuManager mgr) {

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTree.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTree.java
deleted file mode 100644
index d43ad28..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTree.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

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

-import org.eclipse.swt.*;

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

-import java.util.*;

-

-public class TestTableTree extends TestBrowser {

-

-	TableTreeViewer fViewer;

-	Action fExpandAllAction;

-

-	public TestTableTree() {

-		super();

-		fExpandAllAction= new ExpandAllAction("Expand All", this);

-	}

-public Viewer createViewer(Composite parent) {

-	TableTreeViewer viewer = new TableTreeViewer(parent);

-	viewer.setContentProvider(new TestModelContentProvider());

-	viewer.setLabelProvider(new TestTableTreeLabelProvider());

-	viewer.getTableTree().getTable().setLinesVisible(true);

-

-	TableLayout layout = new TableLayout();

-	viewer.getTableTree().getTable().setLayout(layout);

-	viewer.getTableTree().getTable().setHeaderVisible(true);

-	String headers[] = { "First Column", "Second Column" };

-

-	ColumnLayoutData layouts[] =

-		{ new ColumnWeightData(100), new ColumnWeightData(100)};

-

-	final TableColumn columns[] = new TableColumn[headers.length];

-

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

-		layout.addColumnData(layouts[i]);

-		TableColumn tc = new TableColumn(viewer.getTableTree().getTable(), SWT.NONE, i);

-		tc.setResizable(layouts[i].resizable);

-		tc.setText(headers[i]);

-		columns[i] = tc;

-	}

-	if (fViewer == null)

-		fViewer = viewer;

-

-	return viewer;

-}

-public static void main(String[] args) {

-	TestBrowser browser = new TestTableTree();

-	if (args.length > 0 && args[0].equals("-twopanes"))

-		browser.show2Panes();

-	browser.setBlockOnOpen(true);

-	browser.open(TestElement.createModel(3, 10));

-}

-/**

- * Adds the expand all action to the tests menu.

- */

-protected void viewerFillMenuBar(MenuManager mgr) {

-	MenuManager testMenu = (MenuManager) (mgr.findMenuUsingPath("tests"));

-	testMenu.add(new Separator());

-	testMenu.add(fExpandAllAction);

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java
deleted file mode 100644
index e6b7a01..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

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

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

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

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

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

- 

-public class TestTableTreeLabelProvider extends TestLabelProvider implements ITableLabelProvider{

-/**

- * Returns the label image for a given column.

- *

- * @param element the object representing the entire row. Can be 

- *     <code>null</code> indicating that no input object is set in the viewer.

- * @param columnIndex the index of the column in which the label appears. Numbering is zero based.

- */

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

-	return getImage();

-}

-/**

- * Returns the label text for a given column.

- *

- * @param element the object representing the entire row. Can be 

- *     <code>null</code> indicating that no input object is set in the viewer.

- * @param columnIndex the index of the column in which the label appears. Numbering is zero based.

- */

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

-	if (element != null)

-		return element.toString() + " column " + columnIndex;

-	return null;

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTree.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTree.java
deleted file mode 100644
index c0b6f11..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTree.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-import org.eclipse.jface.*;

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

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

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

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

-import org.eclipse.swt.*;

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

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

-import java.util.*;

-

-public class TestTree extends TestBrowser {

-	TreeViewer fViewer;

-	Action fExpandAllAction;

-	public TestTree() {

-		super();

-		fExpandAllAction= new ExpandAllAction("Expand All", this);

-	}

-/**

- * 

- */

-public Viewer createViewer(Composite parent) {

-	TreeViewer viewer = new TreeViewer(parent);

-	viewer.setContentProvider(new TestModelContentProvider());

-	viewer.setUseHashlookup(true);

-

-	if (fViewer == null)

-		fViewer = viewer;

-	return viewer;

-}

-	public static void main(String[] args) {

-		TestBrowser browser= new TestTree();

-		if (args.length > 0 && args[0].equals("-twopanes")) 							

-			browser.show2Panes();

-		browser.setBlockOnOpen(true);

-		browser.open(TestElement.createModel(3, 10));		

-	}

-	public void testTreeFillMenuBar(MenuManager testMenu) {

-		

-

-

-	}

-/**

- * Adds the expand all action to the tests menu.

- */

-protected void viewerFillMenuBar(MenuManager mgr) {

-	MenuManager testMenu = (MenuManager) (mgr.findMenuUsingPath("tests"));

-	testMenu.add(new Separator());

-	testMenu.add(fExpandAllAction);

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/WorldChangedAction.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/WorldChangedAction.java
deleted file mode 100644
index 90cdad7..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/WorldChangedAction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jface.tests.viewers.interactive;

-

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

-/*

- * Licensed Materials - Property of IBM,

- * WebSphere Studio Workbench

- * (c) Copyright IBM Corp 1999, 2000

- */

-

-public class WorldChangedAction extends TestBrowserAction {

-

-	public WorldChangedAction(String label, TestBrowser browser) {

-		super(label, browser);

-	}

-	public void run() {

-		((StructuredViewer)getBrowser().getViewer()).refresh();

-	}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/SelectionProviderView.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/SelectionProviderView.java
deleted file mode 100644
index e15addf..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/SelectionProviderView.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/TestPlugin.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/TestPlugin.java
deleted file mode 100644
index c8cf594..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/TestPlugin.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.ui.tests;

-

-import java.net.*;

-import java.util.*;

-

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

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

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

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

-

-/**

- * The main plugin class to be used in the desktop.

- */

-public class TestPlugin extends AbstractUIPlugin {

-	//The shared instance.

-	private static TestPlugin plugin;

-	//Resource bundle.

-	private ResourceBundle resourceBundle;

-	

-	/**

-	 * The constructor.

-	 */

-	public TestPlugin(IPluginDescriptor descriptor) {

-		super(descriptor);

-		plugin = this;

-		try {

-			resourceBundle= ResourceBundle.getBundle("org.eclipse.ui.tests.TestPluginResources");

-		} catch (MissingResourceException x) {

-			resourceBundle = null;

-		}

-	}

-

-	/**

-	 * Returns the shared instance.

-	 */

-	public static TestPlugin getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the workspace instance.

-	 */

-	public static IWorkspace getWorkspace() {

-		return ResourcesPlugin.getWorkspace();

-	}

-

-	/**

-	 * Returns the string from the plugin's resource bundle,

-	 * or 'key' if not found.

-	 */

-	public static String getResourceString(String key) {

-		ResourceBundle bundle= TestPlugin.getDefault().getResourceBundle();

-		try {

-			return bundle.getString(key);

-		} catch (MissingResourceException e) {

-			return key;

-		}

-	}

-

-	/**

-	 * Returns the plugin's resource bundle,

-	 */

-	public ResourceBundle getResourceBundle() {

-		return resourceBundle;

-	}

-	

-	/**

-	 * Returns the image descriptor with the given relative path.

-	 */

-	public ImageDescriptor getImageDescriptor(String relativePath) {

-		String iconPath = "icons/";

-		try {

-			URL installURL = getDescriptor().getInstallURL();

-			URL url = new URL(installURL, iconPath + relativePath);

-			return ImageDescriptor.createFromURL(url);

-		}

-		catch (MalformedURLException e) {

-			// should not happen

-			return ImageDescriptor.getMissingImageDescriptor();

-		}

-	}

-	

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
deleted file mode 100644
index 335f3ef..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java
deleted file mode 100644
index 71f9b4d..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.ui.tests.api;

-import junit.framework.*;

-import junit.textui.TestRunner;

-import org.eclipse.swt.SWT;

-

-/**

- * Test all areas of the UI API.

- */

-public class ApiTestSuite extends TestSuite {

-

-	/**

-	 * Returns the suite.  This is required to

-	 * use the JUnit Launcher.

-	 */

-	public static Test suite() {

-		return new ApiTestSuite();

-	}

-	

-	/**

-	 * Construct the test suite.

-	 */

-	public ApiTestSuite() {

-		addTest(new TestSuite(PlatformUITest.class));

-		addTest(new TestSuite(IWorkbenchTest.class));

-		addTest(new TestSuite(IWorkbenchWindowTest.class));

-		addTest(new TestSuite(IWorkbenchPageTest.class));

-		addTest(new TestSuite(IActionFilterTest.class));

-		addTest(new TestSuite(IPageListenerTest.class));

-		addTest(new TestSuite(IPageServiceTest.class));

-		addTest(new TestSuite(IPerspectiveRegistryTest.class));

-		addTest(new TestSuite(IPerspectiveDescriptorTest.class));

-		addTest(new TestSuite(IFileEditorMappingTest.class));

-		addTest(new TestSuite(IEditorDescriptorTest.class));

-		addTest(new TestSuite(IEditorRegistryTest.class));

-		addTest(new TestSuite(IPerspectiveListenerTest.class));

-		addTest(new TestSuite(IWorkbenchWindowActionDelegateTest.class));

-		addTest(new TestSuite(IViewActionDelegateTest.class));

-		addTest(new TestSuite(IViewSiteTest.class));

-		addTest(new TestSuite(IEditorSiteTest.class));

-		addTest(new TestSuite(IActionBarsTest.class));

-		addTest(new TestSuite(IViewPartTest.class));

-		addTest(new TestSuite(IEditorPartTest.class));

-		addTest(new TestSuite(IEditorActionBarContributorTest.class));

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionBarsTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionBarsTest.java
deleted file mode 100644
index ffc78c2..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionBarsTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-

-/**

- * Test the lifecycle of an action delegate.

- */

-public class IActionBarsTest extends UITestCase {

-

-	protected IWorkbenchWindow fWindow;

-	protected IWorkbenchPage fPage;

-

-	private class MockAction extends Action {

-		public boolean hasRun = false;

-		public MockAction() {

-			super();

-		}

-		public void run() {

-			hasRun = true;

-		}

-	}

-		

-	/**

-	 * Constructor for IActionDelegateTest

-	 */

-	public IActionBarsTest(String testName) {

-		super(testName);

-	}

-	

-	public void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	public void testGetMenuManager() throws Throwable {

-		// From Javadoc: "Returns the menu manager."

-		

-		IViewPart part = fPage.showView(MockViewPart.ID);

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

-		assertNotNull(bars);

-		IMenuManager mgr = bars.getMenuManager();

-		assertNotNull(mgr);

-	}

-	

-	public void testGetStatusLineManager() throws Throwable {

-		// From Javadoc: "Returns the status line manager."

-		

-		IViewPart part = fPage.showView(MockViewPart.ID);

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

-		assertNotNull(bars);

-		IStatusLineManager mgr = bars.getStatusLineManager();

-		assertNotNull(mgr);

-	}

-	

-	public void testGetToolBarManager() throws Throwable {

-		// From Javadoc: "Returns the tool bar manager."

-		

-		IViewPart part = fPage.showView(MockViewPart.ID);

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

-		assertNotNull(bars);

-		IToolBarManager mgr = bars.getToolBarManager();

-		assertNotNull(mgr);

-	}

-	

-	public void testGetGlobalActionHandler() throws Throwable {

-		// From Javadoc: "Returns the global action handler for 

-		// the action with the given id.  

-		

-		IViewPart part = fPage.showView(MockViewPart.ID);

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

-		assertNotNull(bars);

-		

-		// Get actions.  They should all be null.

-		assertNull(bars.getGlobalActionHandler(IWorkbenchActionConstants.CUT));

-		assertNull(bars.getGlobalActionHandler(IWorkbenchActionConstants.COPY));

-		assertNull(bars.getGlobalActionHandler(IWorkbenchActionConstants.UNDO));

-		

-		// Create actions.

-		MockAction cut = new MockAction();

-		MockAction copy = new MockAction();

-		MockAction undo = new MockAction();

-		

-		// Set actions.

-		bars.setGlobalActionHandler(IWorkbenchActionConstants.CUT, cut);

-		bars.setGlobalActionHandler(IWorkbenchActionConstants.COPY, copy);

-		bars.setGlobalActionHandler(IWorkbenchActionConstants.UNDO, undo);

-		bars.updateActionBars();

-		

-		// Get actions.  They should not be null.

-		assertEquals(cut, bars.getGlobalActionHandler(IWorkbenchActionConstants.CUT));

-		assertEquals(copy, bars.getGlobalActionHandler(IWorkbenchActionConstants.COPY));

-		assertEquals(undo, bars.getGlobalActionHandler(IWorkbenchActionConstants.UNDO));

-	}

-	

-	public void testSetGlobalActionHandler() throws Throwable {

-		// From Javadoc: "Returns the global action handler for 

-		// the action with the given id.  

-		

-		IViewPart part = fPage.showView(MockViewPart.ID);

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

-		assertNotNull(bars);

-		

-		// Create actions.

-		MockAction cut = new MockAction();

-		MockAction copy = new MockAction();

-		MockAction undo = new MockAction();

-		

-		// Set actions.

-		bars.setGlobalActionHandler(IWorkbenchActionConstants.CUT, cut);

-		bars.setGlobalActionHandler(IWorkbenchActionConstants.COPY, copy);

-		bars.setGlobalActionHandler(IWorkbenchActionConstants.UNDO, undo);

-		bars.updateActionBars();

-

-		// Run the real workbench actions.

-		// Verify the actions are invoked.

-		cut.hasRun = copy.hasRun = undo.hasRun = false;

-		ActionUtil.runActionUsingPath(this, fWindow, 

-			IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.CUT);

-		ActionUtil.runActionUsingPath(this, fWindow, 

-			IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.UNDO);

-		assertTrue(cut.hasRun);

-		assertTrue(!copy.hasRun);

-		assertTrue(undo.hasRun);

-		

-		// Now create a second view and run the actions again.

-		// Our global actions should not be invoked.

-		IViewPart part2 = fPage.showView(MockViewPart.ID2);

-		cut.hasRun = copy.hasRun = undo.hasRun = false;

-		ActionUtil.runActionUsingPath(this, fWindow, 

-			IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.CUT);

-		ActionUtil.runActionUsingPath(this, fWindow, 

-			IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.UNDO);

-		assertTrue(!cut.hasRun);

-		assertTrue(!copy.hasRun);

-		assertTrue(!undo.hasRun);

-		

-		// Reactivate test view and run actions again.

-		// This time our global actions should be invoked.		

-		fPage.activate(part);

-		cut.hasRun = copy.hasRun = undo.hasRun = false;

-		ActionUtil.runActionUsingPath(this, fWindow, 

-			IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.CUT);

-		ActionUtil.runActionUsingPath(this, fWindow, 

-			IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.UNDO);

-		assertTrue(cut.hasRun);

-		assertTrue(!copy.hasRun);

-		assertTrue(undo.hasRun);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionDelegateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionDelegateTest.java
deleted file mode 100644
index 1e1083a..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionDelegateTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-

-/**

- * Test the lifecycle of an action delegate.

- */

-public abstract class IActionDelegateTest extends UITestCase {

-

-	protected IWorkbenchWindow fWindow;

-	protected IWorkbenchPage fPage;

-	

-	/**

-	 * Constructor for IActionDelegateTest

-	 */

-	public IActionDelegateTest(String testName) {

-		super(testName);

-	}

-	

-	public void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	public void testRun() throws Throwable {

-		// Create the action.

-		Object obj = createActionWidget();

-		

-		// Run the action delegate.

-		// The selectionChanged and run methods should be called, in that order.

-		runAction(obj);

-		MockActionDelegate delegate = getDelegate();

-		assertNotNull(delegate);

-		assertTrue(delegate.callHistory.verifyOrder(

-			new String[] {"selectionChanged", "run" } ));

-	}

-	

-	public void testSelectionChanged() throws Throwable {

-		// Create the delegate by running it.

-		Object obj = createActionWidget();

-		runAction(obj);

-		MockActionDelegate delegate = getDelegate();

-		assertNotNull(delegate);

-		

-		// Fire a selection.

-		// The selectionChanged method should be invoked.

-		delegate.callHistory.clear();		

-		fireSelection(obj);

-		assertTrue(delegate.callHistory.contains("selectionChanged"));

-	}

-	

-	/**

-	 * Returns the last mock action delegate which was created.

-	 */

-	protected MockActionDelegate getDelegate() throws Throwable {

-		MockActionDelegate delegate = MockActionDelegate.lastDelegate;

-		assertNotNull(delegate);

-		return delegate;

-	}

-

-	/**

-	 * Creates the widget for an action, and adds the action.

-	 * 

-	 * @returns an object which will be passed to runAction and 

-	 * fireSelection.

-	 */

-	protected abstract Object createActionWidget() throws Throwable;

-	

-	/**

-	 * Adds and runs the action delegate.  Subclasses should override.

-	 * 

-	 * @param obj the object returned from createActionWidget.

-	 */

-	protected abstract void runAction(Object widget) throws Throwable;

-	

-	/**

-	 * Fires a selection from the source.  Subclasses should override.

-	 * 

-	 * @param obj the object returned from createActionWidget.

-	 */

-	protected abstract void fireSelection(Object widget) throws Throwable;

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionFilterTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionFilterTest.java
deleted file mode 100644
index 507a98c..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionFilterTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-/**

- * Test the lifecycle of an action filter.

- * 

- * From Javadoc: "An IActionFilter returns whether the specific attribute

- * 		matches the state of the target object."

- * 

- * Setup: The plugin.xml contains a number of popup menu action 

- * targetted to ListElements 

- * 

- * 		redAction -> (name = red)

- * 		blueAction -> (name = blue)

- * 		trueAction -> (flag = true)

- * 		falseAction -> (flag = false)

- * 		redTrueAction -> (name = red) (flag = true)

- */

-public class IActionFilterTest extends UITestCase {

-

-	protected IWorkbenchWindow fWindow;

-	protected IWorkbenchPage fPage;

-	protected String STATIC_MENU_VIEW_ID = "org.eclipse.ui.tests.api.IActionFilterTest1";

-	protected String DYNAMIC_MENU_VIEW_ID = "org.eclipse.ui.tests.api.IActionFilterTest2";

-		

-	public IActionFilterTest(String testName) {

-		super(testName);

-	}

-	

-	public void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	public void testStaticLifecycle() throws Throwable {

-		testLifecycle(STATIC_MENU_VIEW_ID);

-	}

-	

-	public void testDynamicLifecycle() throws Throwable {

-		testLifecycle(DYNAMIC_MENU_VIEW_ID);

-	}

-

-	/**

-	 * Select a list element, popup the menu, and verify that the 

-	 * action filter is called.

-	 * 

-	 * See Setup above.

-	 */	

-	private void testLifecycle(String viewId) throws Throwable {

-		// Create a list view.  

-		ListView view = (ListView)fPage.showView(viewId);

-

-		// Create the test objects.

-		ListElement red = new ListElement("red");

-		view.addElement(red);

-		view.selectElement(red);

-		

-		// Get action filter.

-		ListElementActionFilter	filter = ListElementActionFilter.getSingleton();

-

-		// Open menu.  Verify that action filter is called.			

-		MenuManager menuMgr = view.getMenuManager();

-		ActionUtil.fireAboutToShow(menuMgr);

-		assertTrue(filter.getCalled());

-	}

-	

-	public void testDynamicMenuContribution() throws Throwable {

-		testMenu(DYNAMIC_MENU_VIEW_ID);

-	}

-	

-	public void testStaticMenuContribution() throws Throwable {

-		testMenu(STATIC_MENU_VIEW_ID);

-	}

-	

-	/**

-	 * Select a ListElement, popup a menu and verify that the 

-	 * ListElementActionFilter.testAttribute method is invoked.  

-	 * Then verify that the correct actions are added to the

-	 * popup menu.

-	 * 

-	 * See Setup above.

-	 */

-	private void testMenu(String viewId) throws Throwable {

-		// Create the test objects.

-		ListElement red = new ListElement("red");

-		ListElement blue = new ListElement("blue");

-		ListElement green = new ListElement("green");

-		ListElement redTrue = new ListElement("red", true);

-		

-		// Create a list view.  

-		ListView view = (ListView)fPage.showView(viewId);

-		MenuManager menuMgr = view.getMenuManager();

-		view.addElement(red);

-		view.addElement(blue);

-		view.addElement(green);

-		view.addElement(redTrue);

-		

-		// Get action filter.

-		ListElementActionFilter	filter = ListElementActionFilter.getSingleton();

-			

-		// Select red, verify popup.

-		view.selectElement(red);

-		ActionUtil.fireAboutToShow(menuMgr);

-		assertTrue(filter.getCalled());

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "redAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "blueAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "trueAction"));

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "falseAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "redTrueAction"));

-		view.verifyActions(this, menuMgr);

-		

-		// Select blue, verify popup.

-		filter.clearCalled();

-		view.selectElement(blue);

-		ActionUtil.fireAboutToShow(menuMgr);

-		assertTrue(filter.getCalled());

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "redAction"));

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "blueAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "trueAction"));

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "falseAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "redTrueAction"));

-		view.verifyActions(this, menuMgr);

-		

-		// Select green, verify popup.

-		filter.clearCalled();

-		view.selectElement(green);

-		ActionUtil.fireAboutToShow(menuMgr);

-		assertTrue(filter.getCalled());

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "redAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "blueAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "trueAction"));

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "falseAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "redTrueAction"));

-		view.verifyActions(this, menuMgr);

-		

-		// Select redTrue, verify popup.

-		filter.clearCalled();

-		view.selectElement(redTrue);

-		ActionUtil.fireAboutToShow(menuMgr);

-		assertTrue(filter.getCalled());

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "redAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "blueAction"));

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "trueAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "falseAction"));

-		assertNotNull(ActionUtil.getActionWithLabel(menuMgr, "redTrueAction"));

-		view.verifyActions(this, menuMgr);

-

-		// Select nothing, verify popup.

-		filter.clearCalled();

-		view.selectElement(null);

-		ActionUtil.fireAboutToShow(menuMgr);

-		assertTrue(!filter.getCalled());

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "redAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "blueAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "trueAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "falseAction"));

-		assertNull(ActionUtil.getActionWithLabel(menuMgr, "redTrueAction"));

-		view.verifyActions(this, menuMgr);

- 	}	

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IConstants.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IConstants.java
deleted file mode 100644
index 850f7ef..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IConstants.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.ui.tests.api;

-public interface IConstants {

-	public static String FakeID =

-		"Is this fake ID for buying beer or getting into a club?",

-		FakeLabel =

-			"Hmmm. Who's to say this is a fake label? I mean, someday, this can be a real label.",

-		UnknownFileName[] =

-			{

-				"This is not a known file name to the world.with a cool extension",

-				"this is not the same as the other.anyways this is a file extension" },

-		KnownFileName[] = { "plugin.xml" },

-		ProjectName = "JUnitTestingProjectName";

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionBarContributorTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionBarContributorTest.java
deleted file mode 100644
index 3780889..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionBarContributorTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-/**

- * This is a test for IEditorPart.  Since IEditorPart is an

- * interface this test verifies the IEditorPart lifecycle rather

- * than the implementation.

- */

-public class IEditorActionBarContributorTest extends UITestCase {

-

-	protected IWorkbenchWindow fWindow;

-	protected IWorkbenchPage fPage;

-	private String EDITOR_ID = "org.eclipse.ui.tests.api.IEditorActionBarContributorTest";

-	

-	/**

-	 * Constructor for IEditorPartTest

-	 */

-	public IEditorActionBarContributorTest(String testName) {

-		super(testName);

-	}

-

-	public void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	public void testInit() throws Throwable {

-		// From javadoc: "Initializes this contributor, which is expected to 

-		// add contributions as required to the given action bars and global 

-		// action handlers."

-		

-		// Open a part.

-		MockEditorPart part = openEditor(fPage, "1");

-		

-		// Get contributor and verify call history.

-		MockEditorActionBarContributor contributor = 

-			(MockEditorActionBarContributor)part.getEditorSite().getActionBarContributor();

-		CallHistory history = contributor.getCallHistory();

-		assertTrue(history.verifyOrder(new String[] {

-			"init", "setActiveEditor"}));

-		assertEquals(part, contributor.getActiveEditor());

-		

-		// Close the part.

-		fPage.closeAllEditors(false);

-	}

-	

-	public void testSetActiveEditor() throws Throwable {

-		// From javadoc: "Sets the active editor for the contributor."

-		

-		// Open an editor.

-		MockEditorPart part = openEditor(fPage, "X");

-		

-		// Get contributor and verify call history.

-		MockEditorActionBarContributor contributor = 

-			(MockEditorActionBarContributor)

-				part.getEditorSite().getActionBarContributor();

-		CallHistory history = contributor.getCallHistory();

-		assertTrue(history.verifyOrder(new String[] {

-			"init", "setActiveEditor" }));

-		assertEquals(part, contributor.getActiveEditor());

-		

-		// Open a few more and verify setActiveEditor.

-		int editorCount = 5;

-		MockEditorPart [] parts = new MockEditorPart[editorCount];

-		for (int nX = 0; nX < editorCount; nX ++) {

-			history.clear();

-			parts[nX] = openEditor(fPage, Integer.toString(nX));

-			assertTrue(history.verifyOrder(new String[] {	

-				"setActiveEditor" }));

-			assertEquals(parts[nX], contributor.getActiveEditor());

-		}

-		

-		// Activate the parts and verify setActiveEditor.

-		for (int nX = 0; nX < editorCount; nX ++) {

-			history.clear();

-			fPage.activate(parts[nX]);

-			assertTrue(history.verifyOrder(new String[] {	

-				"setActiveEditor" }));

-			assertEquals(parts[nX], contributor.getActiveEditor());

-		}

-		

-		// Close the parts.

-		fPage.closeAllEditors(false);

-	}

-	

-	/**

-	 * @see IWorkbenchPartTest#openPart(IWorkbenchPage)

-	 */

-	protected MockEditorPart openEditor(IWorkbenchPage page, String suffix) 

-		throws Throwable 

-	{

-		IProject proj = FileUtil.createProject("IEditorActionBarContributorTest");

-		IFile file = FileUtil.createFile("test" + suffix + ".txt", proj);

-		return (MockEditorPart)page.openEditor(file, EDITOR_ID);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionDelegateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionDelegateTest.java
deleted file mode 100644
index 8b4d696..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorActionDelegateTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

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

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.jdt.junit.util.*;

-

-

-/**

- * Tests the lifecycle for an editor action delegate.

- */

-public class IEditorActionDelegateTest extends IActionDelegateTest {

-	

-	public static String EDITOR_ID = "org.eclipse.ui.tests.api.IEditorActionDelegateTest";

-	private MockEditorPart editor;

-

-	/**

-	 * Constructor for IWorkbenchWindowActionDelegateTest

-	 */

-	public IEditorActionDelegateTest(String testName) {

-		super(testName);

-	}

-

-	public void testSetActiveEditor() throws Throwable {

-		// When an action delegate is run the

-		// setActiveEditor, selectionChanged, and run methods should

-		// be called, in that order.

-		

-		// Run the action.

-		testRun();

-		

-		// Verify lifecycle.

-		MockActionDelegate delegate = getDelegate();

-		assertNotNull(delegate);

-		assertTrue(delegate.callHistory.verifyOrder(

-			new String [] {"setActiveEditor", "selectionChanged", "run"}));

-	}

-	

-	/**

-	 * @see IActionDelegateTest#createActionWidget()

-	 */

-	protected Object createActionWidget() throws Throwable {

-		editor = openEditor(fPage, "X");

-		return editor;

-	}

-

-	/**

-	 * @see IActionDelegateTest#runAction()

-	 */

-	protected void runAction(Object widget) throws Throwable {

-		MockEditorPart editor = (MockEditorPart)widget;

-		MockEditorActionBarContributor contributor = 	

-			(MockEditorActionBarContributor)

-				editor.getEditorSite().getActionBarContributor();

-		IMenuManager mgr = contributor.getActionBars().getMenuManager();

-		ActionUtil.runActionWithLabel(this, mgr, "Mock Action");

-	}

-

-	/**

-	 * @see IActionDelegateTest#fireSelection()

-	 */

-	protected void fireSelection(Object widget) throws Throwable {

-		MockEditorPart editor = (MockEditorPart)widget;

-		editor.fireSelection();

-	}

-	

-	protected MockEditorPart openEditor(IWorkbenchPage page, String suffix) 

-		throws Throwable 

-	{

-		IProject proj = FileUtil.createProject("IEditorActionDelegateTest");

-		IFile file = FileUtil.createFile("test" + suffix + ".txt", proj);

-		return (MockEditorPart)page.openEditor(file, EDITOR_ID);

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorDescriptorTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorDescriptorTest.java
deleted file mode 100644
index 40c13bd..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorDescriptorTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import junit.framework.TestCase;

-import org.eclipse.jdt.junit.util.*;

-import org.eclipse.ui.*;

-

-public class IEditorDescriptorTest extends TestCase {

-	IEditorDescriptor[] fEditors;

-	

-	public IEditorDescriptorTest( String testName )

-	{

-		super( testName );

-	}

-	

-	public void setUp()

-	{

-		IFileEditorMapping mapping = ( IFileEditorMapping )ArrayUtil.pickRandom( 

-				PlatformUI.getWorkbench().getEditorRegistry().getFileEditorMappings() 

-			);

-		fEditors = mapping.getEditors();

-	}

-	

-	public void testGetId() throws Throwable

-	{

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

-			assertNotNull( fEditors[ i ].getId() );	

-	}

- 

- 	public void testGetImageDescriptor()  throws Throwable

-	{

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

-			assertNotNull( fEditors[ i ].getImageDescriptor() );	

-	}

-

- 	public void testGetLabel() throws Throwable

-	{

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

-			assertNotNull( fEditors[ i ].getLabel() );	

-	}	

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorLauncherTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorLauncherTest.java
deleted file mode 100644
index 0e8576e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorLauncherTest.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.ui.tests.api;

-public class IEditorLauncherTest {

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorPartTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorPartTest.java
deleted file mode 100644
index d4ec476..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorPartTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

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

-import org.eclipse.jdt.junit.util.FileUtil;

-

-/**

- * This is a test for IEditorPart.  Since IEditorPart is an

- * interface this test verifies the IEditorPart lifecycle rather

- * than the implementation.

- */

-public class IEditorPartTest extends IWorkbenchPartTest {

-

-	/**

-	 * Constructor for IEditorPartTest

-	 */

-	public IEditorPartTest(String testName) {

-		super(testName);

-	}

-

-	/**

-	 * @see IWorkbenchPartTest#openPart(IWorkbenchPage)

-	 */

-	protected MockWorkbenchPart openPart(IWorkbenchPage page) throws Throwable {

-		IProject proj = FileUtil.createProject("IEditorPartTest");

-		IFile file = FileUtil.createFile("IEditorPartTest.txt", proj);

-		return (MockWorkbenchPart)page.openEditor(file, MockEditorPart.ID1);

-	}

-

-	/**

-	 * @see IWorkbenchPartTest#closePart(IWorkbenchPage, MockWorkbenchPart)

-	 */

-	protected void closePart(IWorkbenchPage page, MockWorkbenchPart part)

-		throws Throwable 

-	{

-		page.closeEditor((IEditorPart)part, false);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorRegistryTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorRegistryTest.java
deleted file mode 100644
index 70fe39c..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorRegistryTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import junit.framework.TestCase;

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

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

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

-import org.eclipse.jdt.junit.util.*;

-import org.eclipse.ui.*;

-import org.eclipse.ui.internal.registry.*;

-

-public class IEditorRegistryTest extends TestCase {

-	private IEditorRegistry fReg;

-	private IProject proj;	

-

-	public IEditorRegistryTest( String testName )

-	{

-		super( testName );		

-	}

-	

-	public void setUp()

-	{                                                              

-		fReg = PlatformUI.getWorkbench().getEditorRegistry();		

-	}

-	

-	public void tearDown()

-	{

-		if( proj != null ){

-			try{

-				FileUtil.deleteProject( proj );

-			}catch( CoreException e )

-			{

-				fail();

-			}

-		}

-	}

-

-	public void testGetFileEditorMappings()

-	{

-		assertTrue( ArrayUtil.checkNotNull( fReg.getFileEditorMappings() ) );

-	}

-	

-	/**

-	 *	tests both of the following:

-	 *	IEditorDescriptor[] getEditors(IFile file) 

-	 *	IEditorDescriptor[] getEditors(String filename)  

-	 */

-	public void testGetEditors() throws Throwable

-	{		

-		IEditorDescriptor[] editors, editors2;

-		String[][] maps = {

-			{"a.mock1", MockEditorPart.ID1 },

-			{"b.mock2", MockEditorPart.ID2 }

-		};

-		

-		proj = FileUtil.createProject("testProject");

-		

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

-			editors = fReg.getEditors( maps[i][0] );

-			assertEquals( editors.length, 1 );

-			assertEquals( editors[ 0 ].getId(), maps[i][1] );

-			editors2 = fReg.getEditors( FileUtil.createFile( maps[i][0], proj ) );

-			assertEquals( ArrayUtil.equals( editors, editors2 ), true );

-		}

-

-		//there is no matching editor

-		String fileName = IConstants.UnknownFileName[0];

-		editors = fReg.getEditors( fileName );

-		assertEquals( editors.length, 0 );

-		editors = fReg.getEditors( FileUtil.createFile( fileName, proj ));

-		assertEquals( editors.length, 0 );

-	}

-

-	public void testFindEditor() 

-	{

-		String id = MockEditorPart.ID1;	

-		IEditorDescriptor editor = fReg.findEditor( id );		

-		assertEquals( editor.getId(), id );		

-		

-		//editor is not found

-		id = IConstants.FakeID;

-		editor = fReg.findEditor( id );		

-		assertNull( editor );

-	}

-

-	/**

-	 * getDefaultEditor()

-	 */	

-	public void testGetDefaultEditor()

-	{		

-		assertNotNull( fReg.getDefaultEditor() );	

-	}	

-

-	/**

-	 * getDefaultEditor(String fileName)

-	 */

-	public void testGetDefaultEditor2()

-	{

-		IEditorDescriptor editor = fReg.getDefaultEditor( "a.mock1" );

-		assertEquals( editor.getId(), MockEditorPart.ID1 );

-		

-		// same extension with different name

-		IEditorDescriptor editor2 = fReg.getDefaultEditor( "b.mock1" );

-		assertEquals( editor, editor2 );

-				

-		//editor not found		

-		assertNull( fReg.getDefaultEditor( IConstants.UnknownFileName[0] ) );

-	}

-

-	/**

-	 * getDefaultEditor(IFile file)	

-	 */

-	public void testGetDefaultEditor3() throws Throwable

-	{

-		proj = FileUtil.createProject("testProject");

-		

-		IFile file = FileUtil.createFile("Whats up.bro", proj);

-		String id = MockEditorPart.ID1;

-		fReg.setDefaultEditor( file, id );

-		IEditorDescriptor editor = fReg.getDefaultEditor( file );

-		assertEquals( editor.getId(), id );

-		

-		//attach an IFile object with a registered extension to a different editor

-		file = FileUtil.createFile("ambush.mock1", proj);

-		id = MockEditorPart.ID2;

-		fReg.setDefaultEditor( file, id );

-		editor = fReg.getDefaultEditor( file );

-		assertEquals( editor.getId(), id );

-		

-		//a non-registered IFile object with a registered extension

-		String name = "what.mock2";

-		file = FileUtil.createFile( name, proj);

-		editor = fReg.getDefaultEditor( file );

-		assertEquals( editor, fReg.getDefaultEditor( name ) );

-		

-		//a non-registered IFile object with an unregistered extension

-		name = IConstants.UnknownFileName[0];

-		file = FileUtil.createFile( name, proj);

-		assertNull( fReg.getDefaultEditor( file ) );

-	}

-	

-	public void testSetDefaultEditor() throws Throwable

-	{

-		proj = FileUtil.createProject("testProject");		

-		IFile file = FileUtil.createFile("good.file", proj);

-

-		String id = MockEditorPart.ID1;

-		fReg.setDefaultEditor( file, id );	

-		IEditorDescriptor editor = fReg.getDefaultEditor( file );

-		assertEquals( editor.getId(), id );

-		

-		//change the default editor

-		id = MockEditorPart.ID2;

-		fReg.setDefaultEditor( file, id );	

-		editor = fReg.getDefaultEditor( file );

-		assertEquals( editor.getId(), id );

-		

-		//register the default editor with an invalid editor id

-		fReg.setDefaultEditor( file, IConstants.FakeID );	

-		assertNull( fReg.getDefaultEditor( file ) );		

-	}

-	

-	/**

-	 *	tests both of the following:

-	 *	getImageDescriptor(IFile file)    

-	 * 	getImageDescriptor(String filename)  

-	 */

-	public void testGetImageDescriptor() throws Throwable

-	{

-		proj = FileUtil.createProject("testProject");		

-		

-		

-		IFileEditorMapping[] mappings = fReg.getFileEditorMappings();

-		ImageDescriptor image1, image2; 

-		String fileName;

-		

-		fileName = "a.mock1";

-		IFile file = FileUtil.createFile(fileName, proj);

-		image1 = fReg.getImageDescriptor( fileName );

-		image2 = fReg.getDefaultEditor( fileName).getImageDescriptor();

-		assertEquals( image1, image2 );

-		//for getImageDescriptor(IFile file)

-		assertEquals( image1, fReg.getImageDescriptor( file ) );

-		

-		//same extension, different file name

-		fileName = "b.mock1";

-		file = FileUtil.createFile(fileName, proj);

-		assertEquals( image1, fReg.getImageDescriptor( fileName ) );

-		assertEquals( image1, fReg.getImageDescriptor( file ) );

-		

-		//default image		

-		fileName = "a.nullAndVoid";

-		file = FileUtil.createFile(fileName, proj);

-		image1 = fReg.getImageDescriptor( fileName );

-		image2 = fReg.getImageDescriptor( "b.this_is_not_good" );				

-		assertNotNull( image1 );

-		assertEquals( image1, image2 );

-		assertEquals( image2, fReg.getImageDescriptor( file ) );

-	}

-	

-	public void testAddPropertyListener() throws Throwable

-	{

-		final String METHOD = "propertyChanged";

-		

-		//take out mappings from the registry and put them back right away

-		//so that the event gets triggered without making change to the registry

-		IFileEditorMapping[] src = fReg.getFileEditorMappings();

-		FileEditorMapping[] maps = new FileEditorMapping[src.length];

-		System.arraycopy( src, 0, maps, 0, src.length);

-

-		MockPropertyListener listener = new MockPropertyListener( fReg, fReg.PROP_CONTENTS );

-		fReg.addPropertyListener( listener );

-		CallHistory callTrace = listener.getCallHistory();

-

-		//multiple listener

-		MockPropertyListener listener2 = new MockPropertyListener( fReg, fReg.PROP_CONTENTS );

-		fReg.addPropertyListener( listener2 );

-		CallHistory callTrace2 = listener2.getCallHistory();

-

-		//fire!!		

-		callTrace.clear();

-		callTrace2.clear();

-		((EditorRegistry)fReg).setFileEditorMappings( maps );				

-		assertEquals( callTrace.contains( METHOD ), true);

-		assertEquals( callTrace2.contains( METHOD ), true);

-		

-		//add the same listener second time

-		fReg.addPropertyListener( listener );

-		

-		//fire!!		

-		callTrace.clear();

-		((EditorRegistry)fReg).setFileEditorMappings( maps );				

-		//make sure the method was called only once

-		assertEquals( callTrace.verifyOrder( 

-			new String[] { METHOD } ), true);

-		

-		fReg.removePropertyListener( listener );

-		fReg.removePropertyListener( listener2 );

-	}

-	

-	public void testRemovePropertyListener()

-	{

-		IFileEditorMapping[] src = fReg.getFileEditorMappings();

-		FileEditorMapping[] maps = new FileEditorMapping[src.length];

-		System.arraycopy( src, 0, maps, 0, src.length);

-	

-		MockPropertyListener listener = new MockPropertyListener( fReg, fReg.PROP_CONTENTS );

-		fReg.addPropertyListener( listener );

-		//remove the listener immediately after adding it

-		fReg.removePropertyListener( listener );

-		CallHistory callTrace = listener.getCallHistory();

-	

-		//fire!!		

-		callTrace.clear();

-		((EditorRegistry)fReg).setFileEditorMappings( maps );				

-		assertEquals( callTrace.contains( "propertyChanged" ), false );

-		

-		//removing the listener that is not registered yet should have no effect

-		try{

-			fReg.removePropertyListener( listener );	

-		}catch( Throwable e )

-		{

-			fail();

-		}

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorSiteTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorSiteTest.java
deleted file mode 100644
index 4fc70de..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorSiteTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-public class IEditorSiteTest extends IWorkbenchPartSiteTest {

-

-	/**

-	 * Constructor for IEditorSiteTest

-	 */

-	public IEditorSiteTest(String testName) {

-		super(testName);

-	}

-

-	/**

-	 * @see IWorkbenchPartSiteTest#getTestPartName()

-	 */

-	protected String getTestPartName() throws Throwable {

-		return MockEditorPart.NAME;

-	}

-

-	/**

-	 * @see IWorkbenchPartSiteTest#getTestPartId()

-	 */

-	protected String getTestPartId() throws Throwable {

-		return MockEditorPart.ID1;

-	}

-

-	/**

-	 * @see IWorkbenchPartSiteTest#createTestPart(IWorkbenchPage)

-	 */

-	protected IWorkbenchPart createTestPart(IWorkbenchPage page) throws Throwable {

-		IProject proj = FileUtil.createProject("createTestPart");

-		IFile file = FileUtil.createFile("test1.mock1", proj);

-		return page.openEditor(file);

-	}

-	

-	public void testGetActionBarContributor() throws Throwable {

-		// From Javadoc: "Returns the editor action bar contributor for 

-		// this editor.

-		

-		IEditorPart editor = (IEditorPart) createTestPart(fPage);

-		IEditorSite site = editor.getEditorSite();

-		assertNull(site.getActionBarContributor());

-		

-		// TBD: Flesh this out with a real contributor.

-	}

-

-	

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IFileEditorMappingTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IFileEditorMappingTest.java
deleted file mode 100644
index 65e2383..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IFileEditorMappingTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-import junit.framework.TestCase;

-

-public class IFileEditorMappingTest extends TestCase {

-	private IFileEditorMapping[] fMappings;

-	

-	public IFileEditorMappingTest( String testName )

-	{

-		super( testName );

-	}

-

-	public void setUp()

-	{

-		fMappings = PlatformUI.getWorkbench().getEditorRegistry().getFileEditorMappings();

-	}

-	

-	public void testGetName() throws Throwable

-	{

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

-			assertNotNull( fMappings[ i ].getName() );

-	}

-

-	public void testGetLabel() throws Throwable

-	{

-		String label;

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

-			label = fMappings[ i ].getLabel();

-			assertNotNull( label );

-			assertTrue( label.equals( fMappings[ i ].getName() + "." + fMappings[ i ].getExtension() ) );			

-		}

-	}

-

-	public void testGetExtension() throws Throwable

-	{

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

-			assertNotNull( fMappings[ i ].getExtension() );

-	}

-

-	public void testGetEditors() throws Throwable

-	{

-		IEditorDescriptor[] editors;

-		

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

-			editors = fMappings[ i ].getEditors();

-			assertTrue( ArrayUtil.checkNotNull( editors ) == true );

-		}

-	}

-

-	public void testGetImageDescriptor() throws Throwable

-	{

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

-			assertNotNull( fMappings[ i ].getImageDescriptor() );

-	}

-

-//how do i set the default editor?

-	public void testGetDefaultEditor()  throws Throwable

-	{		

-/*		for( int i = 0; i < fMappings.length; i ++ )

-			assertNotNull( fMappings[ i ].getDefaultEditor() );*/

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageListenerTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageListenerTest.java
deleted file mode 100644
index 2df97d3..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageListenerTest.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageServiceTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageServiceTest.java
deleted file mode 100644
index b4a3d9e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPageServiceTest.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveDescriptorTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveDescriptorTest.java
deleted file mode 100644
index 3d62093..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveDescriptorTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import junit.framework.TestCase;

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-public class IPerspectiveDescriptorTest extends TestCase {

-

-	private IPerspectiveDescriptor fPer;

-	private IPerspectiveRegistry fReg;

-	

-	public IPerspectiveDescriptorTest( String testName )

-	{

-		super( testName );

-	}

-	

-	public void setUp()

-	{

-		fPer = ( IPerspectiveDescriptor )ArrayUtil.pickRandom( PlatformUI.getWorkbench().getPerspectiveRegistry().getPerspectives() );

-		//fPer.

-	}

-	

-	public void testGetId()

-	{

-		assertNotNull( fPer.getId() );

-	}

-	

-	public void testGetLabel()

-	{

-		assertNotNull( fPer.getLabel() );	

-	}

-

-//	This always fails

-	public void testGetImageDescriptor()

-	{

-/*		IWorkbench wb = PlatformUI.getWorkbench();

-		

-		IPerspectiveDescriptor[] pers = wb.getPerspectiveRegistry().getPerspectives();

-		IWorkbenchPage page = wb.getActiveWorkbenchWindow().getActivePage();

-	

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

-			if( pers[ i ] != page.getPerspective() ){

-				page.setPerspective( pers[ i ] );

-				break;

-			}

-

-		System.out.println( "active page pers: " + page.getPerspective().getLabel() );

-		System.out.println( "active pers image: " + page.getPerspective().getImageDescriptor() );

-

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

-			if( pers[ i ].getLabel().equals( "Resource" ) ){

-				System.out.println( "resource image: " + pers[ i ].getImageDescriptor() );

-				break;

-			}

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

-			assertNotNull( pers[ i ].getImageDescriptor() );

-		}*/

-	}

-	

-	public void testThis()

-	{

-//		opne

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveListenerTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveListenerTest.java
deleted file mode 100644
index bee78e6..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveListenerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

-import junit.framework.*;

-import org.eclipse.jdt.junit.util.*;

-

-public class IPerspectiveListenerTest extends UITestCase implements IPerspectiveListener {

-	private int fEvent;

-	private IWorkbenchWindow fWindow;

-	private IWorkbenchPage fPageMask;

-	private IPerspectiveDescriptor fPerMask;

-	

-	/**

-	 * bit masks for events

-	 */

-	public static final int 

-		NONE = 0x00,

-		OPEN = 0x01,

-		CLOSED = 0x02,

-		ACTIVATED = 0x04,

-		CHANGED = 0x08;

-	

-	public IPerspectiveListenerTest( String testName )

-	{

-		super( testName );

-	}

-	

-	public void setUp()

-	{

-		fEvent = NONE;		

-		fWindow = openTestWindow();		

-		fWindow.addPerspectiveListener( this );

-	}

-	

-	public void tearDown()

-	{

-		fWindow.removePerspectiveListener( this );

-	}

-	

-	public void testPerspectiveActivated()

-	{

-		fPageMask = fWindow.getActivePage();

-		fPerMask = fWorkbench.getPerspectiveRegistry().findPerspectiveWithId(EmptyPerspective.PERSP_ID );

-		fPageMask.setPerspective( fPerMask );

-		

-		assertEquals( isActivated( fEvent ), true );

-	}

-

-	public void testPerspectiveChanged()

-	{

-		fPageMask = fWindow.getActivePage();

-		fPerMask = fWorkbench.getPerspectiveRegistry().findPerspectiveWithId(EmptyPerspective.PERSP_ID );

-		fPageMask.setPerspective( fPerMask );

-		

-		assertEquals( isActivated( fEvent ), true );

-	}

-	

-	/**

-	 * @see IPerspectiveListener#perspectiveActivated(IWorkbenchPage, IPerspectiveDescriptor)

-	 */

-	public void perspectiveActivated( IWorkbenchPage page, IPerspectiveDescriptor perspective ) 

-	{

-		if( page == fPageMask && perspective == fPerMask )

-			fEvent |= ACTIVATED;

-	}

-

-	/**

-	 * @see IPerspectiveListener#perspectiveChanged(IWorkbenchPage, IPerspectiveDescriptor, String)

-	 */

-	public void perspectiveChanged( IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) 

-	{

-		if( page == fPageMask && perspective == fPerMask )

-			fEvent |= CHANGED;

-	}

-	

-	public static boolean isOpen( int bits )

-	{

-		return ( ( bits & OPEN ) != 0 );		

-	}

-

-	public static boolean isClosed( int bits )

-	{

-		return ( ( bits & CLOSED ) != 0 );		

-	}

-	

-	public static boolean isActivated( int bits )

-	{

-		return ( ( bits & ACTIVATED ) != 0 );		

-	}

-	

-	public static boolean isChanged( int bits )

-	{

-		return( ( bits & CLOSED ) != 0 );

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveRegistryTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveRegistryTest.java
deleted file mode 100644
index 08265e3..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IPerspectiveRegistryTest.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ISelectionServiceTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ISelectionServiceTest.java
deleted file mode 100644
index 89facfc..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ISelectionServiceTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.jdt.junit.util.UITestCase;

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

-import org.eclipse.ui.*;

-import org.eclipse.ui.tests.SelectionProviderView;

-

-/**

- * Tests the ISelectionService class.

- */

-public class ISelectionServiceTest extends UITestCase 

-	implements ISelectionListener

-{

-	private IWorkbenchWindow fWindow;

-	private IWorkbenchPage fPage;

-	

-	// Event state.

-	private boolean eventReceived;

-	private ISelection eventSelection;

-	private IWorkbenchPart eventPart;

-	

-	public ISelectionServiceTest(String testName) {

-		super(testName);

-	}

-

-	protected void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	/**

-	 * Tests the addSelectionListener method.

-	 */	

-	public void testAddSelectionListener() throws Throwable {

-		// From Javadoc: "Adds the given selection listener.

-		// Has no effect if an identical listener is already registered."

-		

-		// Add listener.

-		fPage.addSelectionListener(this);

-		

-		// Open a view and select something.

-		// Verify events are received.

-		clearEventState();

-		SelectionProviderView view = (SelectionProviderView)

-			fPage.showView(SelectionProviderView.ID);

-		view.setSelection("Selection");

-		assertTrue("EventReceived", eventReceived);

-	}

-	

-	/**

-	 * Tests the removePageListener method.

-	 */

-	public void testRemoveSelectionListener() throws Throwable {

-		// From Javadoc: "Removes the given selection listener.

- 		// Has no affect if an identical listener is not registered."

-		

-		// Add and remove listener.

-		fPage.addSelectionListener(this);

-		fPage.removeSelectionListener(this);		

-		

-		// Open a view and select something.

-		// Verify no events are received.

-		clearEventState();

-		SelectionProviderView view = (SelectionProviderView)

-			fPage.showView(SelectionProviderView.ID);

-		view.setSelection("Selection");

-		assertTrue("EventReceived", !eventReceived);

-	}

-

-	/**

-	 * Tests getActivePage.

-	 */

-	public void testGetSelection() throws Throwable {

-		// From Javadoc: "Returns the current selection in the active part.  

-		// If the selection in the active part is <em>undefined</em> (the 

-		// active part has no selection provider) the result will be 

-		// <code>null</code>"

-		Object actualSel, sel1 = "Selection 1", sel2 = "Selection 2";

-		

-		// Open view.

-		SelectionProviderView view = (SelectionProviderView)

-			fPage.showView(SelectionProviderView.ID);

-			

-		// Fire selection and verify.

-		view.setSelection(sel1);

-		actualSel = unwrapSelection(fPage.getSelection());

-		assertEquals("Selection", sel1, actualSel);

-		

-		// Fire selection and verify.

-		view.setSelection(sel2);

-		actualSel = unwrapSelection(fPage.getSelection());

-		assertEquals("Selection", sel2, actualSel);

-		

-		// Close view and verify.

-		fPage.hideView(view);

-		assertNull("getSelection", fPage.getSelection());

-	}

-

-	/**

-	 * Test event firing for inactive parts.  In this scenario 

-	 * the event should not be fired.

-	 */

-	public void testSelectionEventWhenInactive() throws Throwable {

-		Object sel1 = "Selection 1", sel2 = "Selection 2";

-		

-		// Add listener.

-		fPage.addSelectionListener(this);

-

-		// Open two views.

-		SelectionProviderView view1 = (SelectionProviderView)

-			fPage.showView(SelectionProviderView.ID);

-		SelectionProviderView view2 = (SelectionProviderView)

-			fPage.showView(SelectionProviderView.ID_2);

-			

-		// Fire selection from the second.

-		// Verify it is received.

-		clearEventState();

-		view2.setSelection(sel2);

-		assertTrue("EventReceived", eventReceived);

-		assertEquals("EventPart", view2, eventPart);

-		assertEquals("Event Selection", sel2, unwrapSelection(eventSelection));

-

-		// Fire selection from the first.

-		// Verify it is NOT received.

-		clearEventState();

-		view1.setSelection(sel1);

-		assertTrue("Unexpected selection events received", !eventReceived);

-	}

-		

-	/**

-	 * Test event firing when activated.  

-	 */

-	public void testSelectionEventWhenActivated() throws Throwable {

-		// From Javadoc: "Adds the given selection listener.

-		// Has no effect if an identical listener is already registered."

-		Object sel1 = "Selection 1", sel2 = "Selection 2";

-		

-		// Add listener.

-		fPage.addSelectionListener(this);

-		

-		// Open a view and select something.

-		SelectionProviderView view1 = (SelectionProviderView)

-			fPage.showView(SelectionProviderView.ID);

-		view1.setSelection(sel1);

-		

-		// Open another view and select something.

-		SelectionProviderView view2 = (SelectionProviderView)

-			fPage.showView(SelectionProviderView.ID_2);

-		view2.setSelection(sel2);

-		

-		// Activate the first view.

-		// Verify that selection events are fired.

-		clearEventState();

-		fPage.activate(view1);

-		assertTrue("EventReceived", eventReceived);

-		assertEquals("EventPart", view1, eventPart);

-		assertEquals("Event Selection", sel1, unwrapSelection(eventSelection));

-		

-		// Activate the second view.

-		// Verify that selection events are fired.

-		clearEventState();

-		fPage.activate(view2);

-		assertTrue("EventReceived", eventReceived);

-		assertEquals("EventPart", view2, eventPart);

-		assertEquals("Event Selection", sel2, unwrapSelection(eventSelection));

-	}

-		

-	/**

-	 * Unwrap a selection.

-	 */

-	private Object unwrapSelection(ISelection sel) {

-		if (sel instanceof StructuredSelection) {

-			StructuredSelection struct = (StructuredSelection)sel;

-			if (struct.size() == 1)

-				return struct.getFirstElement();

-		}

-		return null;

-	}

-	

-	/**

-	 * Clear the event state.

-	 */

-	private void clearEventState() {

-		eventReceived = false;

-		eventPart = null;

-		eventSelection = null;

-	}

-		

-	/*

-	 * @see ISelectionListener#selectionChanged(IWorkbenchPart, ISelection)

-	 */

-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {

-		eventReceived = true;

-		eventPart = part;

-		eventSelection = selection;

-	}

-

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewActionDelegateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewActionDelegateTest.java
deleted file mode 100644
index 07ac1c6..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewActionDelegateTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.jdt.junit.util.*;

-

-

-/**

- * Tests the lifecycle for a view action delegate.

- */

-public class IViewActionDelegateTest extends IActionDelegateTest {

-	

-	public static String TEST_VIEW_ID = "org.eclipse.ui.tests.api.IViewActionDelegateTest";

-

-	/**

-	 * Constructor for IWorkbenchWindowActionDelegateTest

-	 */

-	public IViewActionDelegateTest(String testName) {

-		super(testName);

-	}

-

-	public void testInit() throws Throwable {

-		// When an action delegate is run the

-		// init, selectionChanged, and run methods should

-		// be called, in that order.

-		

-		// Run the action.

-		testRun();

-		

-		// Verify lifecycle.

-		MockActionDelegate delegate = getDelegate();

-		assertNotNull(delegate);

-		assertTrue(delegate.callHistory.verifyOrder(

-			new String [] {"init", "selectionChanged", "run"}));

-	}

-	

-	/**

-	 * @see IActionDelegateTest#createActionWidget()

-	 */

-	protected Object createActionWidget() throws Throwable {

-		MockViewPart view = (MockViewPart)fPage.showView(TEST_VIEW_ID);

-		return view;

-	}

-

-	/**

-	 * @see IActionDelegateTest#runAction()

-	 */

-	protected void runAction(Object widget) throws Throwable {

-		MockViewPart view = (MockViewPart)widget;

-		IMenuManager mgr = view.getViewSite().getActionBars().getMenuManager();

-		ActionUtil.runActionWithLabel(this, mgr, "Mock Action");

-	}

-

-	/**

-	 * @see IActionDelegateTest#fireSelection()

-	 */

-	protected void fireSelection(Object widget) throws Throwable {

-		MockViewPart view = (MockViewPart)widget;

-		view.fireSelection();

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewPartTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewPartTest.java
deleted file mode 100644
index 1838a12..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewPartTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

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

-

-/**

- * This is a test for IViewPart.  Since IViewPart is an

- * interface this test verifies the IViewPart lifecycle rather

- * than the implementation.

- */

-public class IViewPartTest extends IWorkbenchPartTest {

-

-	/**

-	 * Constructor for IEditorPartTest

-	 */

-	public IViewPartTest(String testName) {

-		super(testName);

-	}

-

-	/**

-	 * @see IWorkbenchPartTest#openPart(IWorkbenchPage)

-	 */

-	protected MockWorkbenchPart openPart(IWorkbenchPage page) throws Throwable {

-		return (MockWorkbenchPart)page.showView(MockViewPart.ID);

-	}

-

-	/**

-	 * @see IWorkbenchPartTest#closePart(IWorkbenchPage, MockWorkbenchPart)

-	 */

-	protected void closePart(IWorkbenchPage page, MockWorkbenchPart part)

-		throws Throwable 

-	{

-		page.hideView((IViewPart)part);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewSiteTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewSiteTest.java
deleted file mode 100644
index 9ec2a59..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IViewSiteTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

-

-public class IViewSiteTest extends IWorkbenchPartSiteTest {

-

-	/**

-	 * Constructor for IViewPartSiteTest

-	 */

-	public IViewSiteTest(String testName) {

-		super(testName);

-	}

-

-	/**

-	 * @see IWorkbenchPartSiteTest#getTestPartName()

-	 */

-	protected String getTestPartName() throws Throwable {

-		return MockViewPart.NAME;

-	}

-

-	/**

-	 * @see IWorkbenchPartSiteTest#getTestPartId()

-	 */

-	protected String getTestPartId() throws Throwable {

-		return MockViewPart.ID;

-	}

-

-	/**

-	 * @see IWorkbenchPartSiteTest#createTestPart(IWorkbenchPage)

-	 */

-	protected IWorkbenchPart createTestPart(IWorkbenchPage page) throws Throwable {

-		return page.showView(MockViewPart.ID);

-	}

-	

-	public void testGetActionBars() throws Throwable {

-		// From Javadoc: "Returns the action bars for this part site."

-		

-		IViewPart view = (IViewPart) createTestPart(fPage);

-		IViewSite site = view.getViewSite();

-		assertNotNull(site.getActionBars());

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPageTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPageTest.java
deleted file mode 100644
index bebb340..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPageTest.java
+++ /dev/null
@@ -1,761 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

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

-import org.eclipse.swt.SWT;

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

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

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

-import org.eclipse.ui.internal.registry.*;

-

-public class IWorkbenchPageTest extends UITestCase {

-

-	private IWorkbenchPage fActivePage;

-	private IWorkbenchWindow fWin;

-	private IWorkbenchPart partMask;

-	private IProject proj;

-

-	public IWorkbenchPageTest(String testName) {

-		super(testName);

-	}

-

-	public void setUp() {

-		fWin = openTestWindow();

-		fActivePage = fWin.getActivePage();

-	}

-

-	public void tearDown() throws Exception {

-		super.tearDown();

-		if (proj != null) {

-			try {

-				FileUtil.deleteProject(proj);

-			} catch (Throwable e) {

-				fail();

-			}

-			proj = null;

-		}

-	}

-

-	/**

-	 *	tests both of the following:	

-	 *	setEditorAreaVisible()

-	 *	isEditorAreaVisible()

-	 */

-	public void testGet_SetEditorAreaVisible() throws Throwable {

-		fActivePage.setEditorAreaVisible(true);

-		assertTrue(fActivePage.isEditorAreaVisible() == true);

-

-		fActivePage.setEditorAreaVisible(false);

-		assertTrue(fActivePage.isEditorAreaVisible() == false);

-	}

-

-	public void testGetPerspective() throws Throwable {

-		assertNotNull(fActivePage.getPerspective());

-

-		IWorkbenchPage page =

-			fWin.openPage(EmptyPerspective.PERSP_ID, ResourcesPlugin.getWorkspace());

-		assertEquals(EmptyPerspective.PERSP_ID, page.getPerspective().getId());

-	}

-

-	public void testSetPerspective() throws Throwable {

-		IPerspectiveDescriptor per =

-			PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(

-				EmptyPerspective.PERSP_ID);

-		fActivePage.setPerspective(per);

-		assertEquals(per, fActivePage.getPerspective());

-	}

-

-	public void testGetLabel() {

-		assertNotNull(fActivePage.getLabel());

-	}

-

-	public void testGetInput() throws Throwable {

-		IAdaptable input = ResourcesPlugin.getWorkspace();

-		IWorkbenchPage page = fWin.openPage(input);

-		assertEquals(input, page.getInput());

-	}

-

-	public void testActivate() throws Throwable {

-		MockViewPart part = (MockViewPart) fActivePage.showView(MockViewPart.ID);

-		MockViewPart part2 = (MockViewPart) fActivePage.showView(MockViewPart.ID2);

-

-		MockPartListener listener = new MockPartListener();

-		fActivePage.addPartListener(listener);

-		fActivePage.activate(part);

-

-		CallHistory callTrace;

-

-		callTrace = part2.getCallHistory();

-		callTrace.clear();

-		fActivePage.activate(part2);

-		assertTrue(callTrace.contains("setFocus"));

-		assertTrue(listener.getCallHistory().contains("partActivated"));

-

-		callTrace = part.getCallHistory();

-		callTrace.clear();

-		fActivePage.activate(part);

-		assertTrue(callTrace.contains("setFocus"));

-		assertTrue(listener.getCallHistory().contains("partActivated"));

-	}

-

-	public void testBringToTop() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		IEditorPart part = fActivePage.openEditor(FileUtil.createFile("a.mock1", proj));

-		IEditorPart part2 =

-			fActivePage.openEditor(FileUtil.createFile("b.mock1", proj));

-

-		MockPartListener listener = new MockPartListener();

-		fActivePage.addPartListener(listener);

-		CallHistory callTrace = listener.getCallHistory();

-

-		//at this point, part2 is active

-		fActivePage.bringToTop(part);

-		assertEquals(callTrace.contains("partBroughtToTop"), true);

-

-		callTrace.clear();

-		fActivePage.bringToTop(part2);

-		assertEquals(callTrace.contains("partBroughtToTop"), true);

-	}

-

-	public void testGetWorkbenchWindow() {

-		assertEquals(fActivePage.getWorkbenchWindow(), fWin);

-		IWorkbenchPage page = openTestPage(fWin);

-		assertEquals(page.getWorkbenchWindow(), fWin);

-	}

-

-	public void testShowView() throws Throwable {

-	/*

-		javadoc: Shows a view in this page and give it focus

-	*/		

-		MockViewPart view = (MockViewPart) fActivePage.showView(MockViewPart.ID);

-		assertNotNull(view);

-		assertTrue(

-			view.getCallHistory().verifyOrder(

-				new String[] { "init", "createPartControl", "setFocus" }));

-	

-		fActivePage.showView(MockViewPart.ID2 );

-		

-	/*

-		javadoc: If the view is already visible, it is given focus

-	*/

-		CallHistory callTrace = view.getCallHistory();

-		callTrace.clear();

-		assertEquals(fActivePage.showView(MockViewPart.ID), view );		

-		assertEquals(callTrace.contains( "setFocus" ), true );

-	}

-

-	/**

-	 *	openEditor(IFile input)

-	 */

-	public void testOpenEditor() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");		

-		

-	/*

-		javadoc: 1. The workbench editor registry is consulted to determine if an editor extension has been

-		registered for the file type. If so, an instance of the editor extension is opened on the file

-	*/

-		IFile file = FileUtil.createFile("test.mock1", proj);

-		IEditorPart editor = fActivePage.openEditor(file);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-		assertEquals(editor.getSite().getId(),

-			fWorkbench.getEditorRegistry().getDefaultEditor(file).getId());

-

-	/*

-		javadoc: 2. Next, the native operating system will be consulted to determine if a native editor exists for 

-		the file type. If so, a new process is started and the native editor is opened on the file.

-	*/

-		//can not be tested

-

-	/*

-		javadoc: 3. If all else fails the file will be opened in a default text editor.		

-	*/

-		// PR 1GkD5O0 - Fails on linux

-		String platform = SWT.getPlatform();

-		if (!platform.equals("motif")) {

-			file = FileUtil.createFile("a.null and void", proj);

-			editor = fActivePage.openEditor(file);

-			assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-			assertEquals(fActivePage.getActiveEditor(), editor);

-			assertEquals(editor.getSite().getId(), "org.eclipse.ui.DefaultTextEditor");

-		}

-			

-		//open another editor to take the focus away from the first editor

-		fActivePage.openEditor(FileUtil.createFile("test.mock2", proj));

-	

-	/*	

-		javadoc: If this page already has an editor open on the target object that editor is activated

-	*/

-		//open the editor second time.		

-		assertEquals(editor, fActivePage.openEditor(file));

-		assertEquals(editor, fActivePage.getActiveEditor());

-	}

-

-	/**

-	 * openEditor(IFile input, String editorID)

-	 */

-	public void testOpenEditor2() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		final IFile file = FileUtil.createFile("asfasdasdf", proj);

-		final String id = MockEditorPart.ID1;

-

-	/*

-		javadoc: The editor type is determined by mapping editorId to an editor extension registered with the workbench.

-	*/	

-		IEditorPart editor = fActivePage.openEditor(file, id);

-		assertEquals(editor.getSite().getId(), id);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-

-		//open another editor to take the focus away from the first editor

-		fActivePage.openEditor(FileUtil.createFile("test.mock2", proj));

-		

-	/*

-		javadoc: If this page already has an editor open on the target object that editor is activated

-	*/

-		//open the first editor second time.

-		assertEquals(fActivePage.openEditor(file, id), editor);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-	}

-

-	/**

-	 * openEditor(IEditorInput input,String editorId)                       

-	 */

-	public void testOpenEditor3() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		final String id = MockEditorPart.ID1;

-		IEditorInput input =

-			new FileEditorInput(FileUtil.createFile("test.mock1", proj));

-			

-	/*

-		javadoc: The editor type is determined by mapping editorId to an editor extension registered with the workbench

-	*/

-		IEditorPart editor = fActivePage.openEditor(input, id);

-		assertEquals(editor.getEditorInput(), input);

-		assertEquals(editor.getSite().getId(), id);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-

-		//open another editor to take the focus away from the first editor

-		fActivePage.openEditor(FileUtil.createFile("test.mock2", proj));

-		

-	/*

-		javadoc: If this page already has an editor open on the target object that editor is activated

-	*/

-		//open the first editor second time.

-		assertEquals(fActivePage.openEditor(input, id), editor);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-	}

-

-	/**

-	 * openEditor(IEditorInput input, String editorId, boolean activate) 

-	 */

-	public void testOpenEditor4() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		final String id = MockEditorPart.ID1;

-		IEditorInput input =

-			new FileEditorInput(FileUtil.createFile("test.mock1", proj));

-		MockPartListener listener = new MockPartListener();

-		fActivePage.addPartListener(listener);

-		CallHistory callTrace = listener.getCallHistory();

-

-	/*

-		javadoc: The editor type is determined by mapping editorId to an editor extension 

-		registered with the workbench. 

-		javadoc: If activate == true the editor will be activated

-	*/

-		//open an editor with activation

-		IEditorPart editor = fActivePage.openEditor(input, id, true);

-		assertEquals(editor.getEditorInput(), input);

-		assertEquals(editor.getSite().getId(), id);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-		assertEquals(callTrace.contains( "partActivated"), true);

-		fActivePage.closeEditor(editor, false);

-

-		//we need another editor so that the editor under test can receive events.

-		//otherwise, events will be ignored.

-		IEditorPart extra = fActivePage.openEditor(FileUtil.createFile("aaaaa", proj));

-

-		//open an editor without activation

-		callTrace.clear();

-		editor = fActivePage.openEditor(input, id, false);

-		assertEquals(editor.getEditorInput(), input);

-		assertEquals(editor.getSite().getId(), id);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(callTrace.contains( "partActivated"), false);

-		assertEquals(callTrace.contains( "partBroughtToTop"), false);

-

-		fActivePage.activate(extra);

-

-	/*

-		javadoc: If this page already has an editor open on the target object that editor is brought to the front

-	*/

-		//open the editor under test second time without activation

-		callTrace.clear();

-		assertEquals(fActivePage.openEditor(input, id, false), editor);

-		assertEquals(callTrace.contains( "partBroughtToTop"), true);

-		assertEquals(callTrace.contains( "partActivated"), false);

-

-		//activate the other editor

-		fActivePage.activate(extra);

-

-	/*

-		javadoc: If activate == true the editor will be activated

-	*/

-		//open the editor under test second time with activation

-		callTrace.clear();

-		assertEquals(fActivePage.openEditor(input, id, true), editor);

-		assertEquals(callTrace.contains( "partBroughtToTop"), true);

-		assertEquals(callTrace.contains( "partActivated"), true);

-	}

-

-	/**

-	 * openEditor(IMarker marker)                       

-	 */

-	public void testOpenEditor5() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		IMarker marker =

-			FileUtil.createFile("aa.mock2", proj).createMarker(IMarker.TASK);

-		CallHistory callTrace;

-

-	/*	

-		javadoc: the cursor and selection state of the editor is then updated from information 

-		recorded in the marker. 

-	*/		

-		//open the registered editor for the marker resource 

-		IEditorPart editor = fActivePage.openEditor(marker);

-		callTrace = ((MockEditorPart) editor).getCallHistory();

-		assertEquals(editor.getSite().getId(), MockEditorPart.ID2);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-		assertEquals(callTrace.contains( "gotoMarker"), true);

-		fActivePage.closeEditor(editor, false);

-

-	/*	

-		javadoc: If the marker contains an EDITOR_ID_ATTR attribute the attribute value will be used to 

-		determine the editor type to be opened

-	*/

-		marker.setAttribute(IWorkbenchPage.EDITOR_ID_ATTR, MockEditorPart.ID1);

-		editor = fActivePage.openEditor(marker);

-		callTrace = ((MockEditorPart) editor).getCallHistory();

-		assertEquals(editor.getSite().getId(), MockEditorPart.ID1);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-		assertEquals(callTrace.contains( "gotoMarker"), true);

-		//do not close the editor this time

-

-	/*

-		javdoc: If this page already has an editor open on the target object that editor is activated

-	*/		

-		callTrace.clear();

-		assertEquals(fActivePage.openEditor(marker), editor);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-		assertEquals(callTrace.contains( "gotoMarker"), true);

-		fActivePage.closeEditor(editor, false);

-	}

-

-	/**

-	 *	openEditor(IMarker marker, boolean activate)                                           

-	 */

-	public void testOpenEditor6() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		IMarker marker =

-			FileUtil.createFile("aa.mock2", proj).createMarker(IMarker.TASK);

-		MockPartListener listener = new MockPartListener();

-		fActivePage.addPartListener(listener);

-		CallHistory listenerCall = listener.getCallHistory();

-		CallHistory editorCall;

-

-		//we need another editor so that the editor under test can receive events.

-		//otherwise, events will be ignored.

-		IEditorPart extra = fActivePage.openEditor(FileUtil.createFile("aaaaa", proj));

-

-	/*

-		javadoc: If activate == true the editor will be activated

-	*/		

-		//open the registered editor for the marker resource with activation

-		IEditorPart editor = fActivePage.openEditor(marker, true);

-		editorCall = ((MockEditorPart) editor).getCallHistory();

-		assertEquals(editor.getSite().getId(), MockEditorPart.ID2);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-

-	/*	

-		javadoc: the cursor and selection state of the editor is then updated from information 

-		recorded in the marker. 

-	*/		

-		assertEquals(editorCall.contains( "gotoMarker"), true);

-		fActivePage.closeEditor(editor, false);

-

-		fActivePage.activate(extra);

-

-		//open the registered editor for the marker resource without activation

-		listenerCall.clear();

-		editor = fActivePage.openEditor(marker, false);

-		editorCall = ((MockEditorPart) editor).getCallHistory();

-		assertEquals(editor.getSite().getId(), MockEditorPart.ID2);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(listenerCall.contains( "partBroughtToTop"), false);

-		assertEquals(listenerCall.contains( "partActivated"), false);	

-		assertEquals(editorCall.contains( "gotoMarker"), true);		

-		fActivePage.closeEditor(editor, false);

-	

-	/*	

-		javadoc: If the marker contains an EDITOR_ID_ATTR attribute the attribute value will be used to 

-		determine the editor type to be opened

-	*/

-		String id = MockEditorPart.ID1;

-		marker.setAttribute(IWorkbenchPage.EDITOR_ID_ATTR, id);

-

-		//open an editor with activation

-		listenerCall.clear();

-	

-		editor = fActivePage.openEditor(marker, true);

-		editorCall = ((MockEditorPart) editor).getCallHistory();

-		assertEquals(editor.getSite().getId(), id);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(fActivePage.getActiveEditor(), editor);

-		assertEquals(editorCall.contains( "gotoMarker"), true);

-		fActivePage.closeEditor(editor, false);

-

-		fActivePage.activate(extra);

-

-		//open an editor without activation

-		listenerCall.clear();

-		editor = fActivePage.openEditor(marker, false);

-		editorCall = ((MockEditorPart) editor).getCallHistory();

-		assertEquals(editor.getSite().getId(), id);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editor), true);

-		assertEquals(editorCall.contains( "gotoMarker"), true);

-		assertEquals(listenerCall.contains( "partActivated"), false);

-		assertEquals(listenerCall.contains( "partBroughtToTop"), false);

-		//do not close the editor this time

-

-		fActivePage.activate(extra);

-

-	/*

-		javadoc: If this page already has an editor open on the target object that editor is brought to front

-	*/

-		//open the editor second time without activation

-		listenerCall.clear();

-		assertEquals(fActivePage.openEditor(marker, false), editor);

-		assertEquals(listenerCall.contains( "partBroughtToTop"), true);

-		assertEquals(listenerCall.contains( "partActivated"), false);

-

-		fActivePage.activate(extra);

-

-	/*

-		javdoc: If activate == true the editor will be activated

-	*/

-		//open the editor second time with activation 		

-		listenerCall.clear();

-		assertEquals(fActivePage.openEditor(marker, true), editor);

-		assertEquals(editorCall.contains( "gotoMarker"), true);

-		assertEquals(listenerCall.contains( "partBroughtToTop"), true);		

-		assertEquals(listenerCall.contains( "partActivated"), true);

-	}

-

-	public void testFindView() throws Throwable {

-		String id = MockViewPart.ID3;

-		//id of valid, but not open view

-		assertNull(fActivePage.findView(id));

-

-		IViewPart view = fActivePage.showView(id);

-		assertEquals(fActivePage.findView(id), view);

-

-		//close view		

-		fActivePage.hideView(view);

-		assertNull(fActivePage.findView(id));

-	}

-

-	public void testGetViews() throws Throwable {

-		int totalBefore = fActivePage.getViews().length;

-

-		IViewPart view = fActivePage.showView(MockViewPart.ID2);

-		assertEquals(ArrayUtil.contains(fActivePage.getViews(), view), true);

-		assertEquals(fActivePage.getViews().length, totalBefore + 1);

-

-		fActivePage.hideView(view);

-		assertEquals(ArrayUtil.contains(fActivePage.getViews(), view), false);

-		assertEquals(fActivePage.getViews().length, totalBefore);

-	}

-

-	public void testHideView() throws Throwable {

-		IViewPart view = fActivePage.showView(MockViewPart.ID3);

-

-		fActivePage.hideView(view);

-		CallHistory callTrace = ((MockViewPart) view).getCallHistory();

-		assertTrue(callTrace.contains( "dispose"));

-	}

-

-	public void testClose() throws Throwable {

-		IWorkbenchPage page = openTestPage(fWin);

-

-		proj = FileUtil.createProject("testOpenEditor");

-		final IFile file = FileUtil.createFile("aaa.mock1", proj);

-		IEditorPart editor = page.openEditor(file);

-		CallHistory callTrace = ((MockEditorPart) editor).getCallHistory();

-		callTrace.clear();

-

-	/*

-		javadoc: If the page has open editors with unsaved content and save is true, the user will be given the opportunity to save them

-	*/		

-		assertEquals(page.close(), true);

-		assertEquals(

-			callTrace.verifyOrder(new String[] { "isDirty", "dispose" }),

-			true);

-		assertEquals(fWin.getActivePage(), fActivePage);	

-	}

-

-	public void testCloseEditor() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		final IFile file = FileUtil.createFile("test.mock1", proj);

-		IEditorPart editor;

-		CallHistory callTrace;

-		MockEditorPart mock;

-

-	/*

-		javadoc: Parameters: save - true to save the editor contents if required (recommended)

-	*/

-		//create a clean editor that needs to be saved on closing

-		editor = fActivePage.openEditor(file);

-		mock = (MockEditorPart) editor;

-		mock.setSaveNeeded(true);

-		callTrace = mock.getCallHistory();

-		callTrace.clear();

-		//close the editor with save confirmation

-		assertEquals( fActivePage.closeEditor(editor, true), true );

-		assertEquals(

-			callTrace.verifyOrder(

-				new String[] { "isSaveOnCloseNeeded", "isDirty", "dispose" }),

-			true);

-

-	/*

-		javadoc: If the editor has unsaved content and save is true, the user will be given the opportunity to save it.

-	*/

-		//can't be tested

-			

-	/*

-		javadoc: Parameters: save - false to discard any unsaved changes

-	*/

-		//create a dirty editor

-		editor = fActivePage.openEditor(file);

-		mock = (MockEditorPart) editor;

-		mock.setDirty(true);

-		mock.setSaveNeeded(true);

-		callTrace = mock.getCallHistory();

-		callTrace.clear();

-		//close the editor and discard changes

-		assertEquals( fActivePage.closeEditor(editor, false), true );

-		assertEquals(callTrace.contains( "isSaveOnCloseNeeded"), false);

-		assertEquals(callTrace.contains( "isDirty"), false);

-		assertEquals(callTrace.contains( "doSave"), false);

-		assertEquals(callTrace.contains( "dispose"), true);

-	}

-

-	public void testCloseAllEditors() throws Throwable

-	{

-		int total = 5;

-		final IFile[] files = new IFile[total];

-		IEditorPart[] editors = new IEditorPart[total];

-		CallHistory[] callTraces = new CallHistory[total];

-		MockEditorPart[] mocks = new MockEditorPart[total];

-

-		proj = FileUtil.createProject("testOpenEditor");

-		for (int i = 0; i < total; i++)

-			files[i] = FileUtil.createFile(i + ".mock2", proj);

-

-	/*

-		javadoc: If the page has open editors with unsaved content and save is true, the user will be given the opportunity to save them.

-	*/		

-		//close all clean editors with confirmation

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

-			editors[i] = fActivePage.openEditor(files[i]);			

-			callTraces[i] = ((MockEditorPart)editors[i]).getCallHistory();		

-		}

-		assertEquals(fActivePage.closeAllEditors(true), true);

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

-			assertEquals(callTraces[i].contains( "isDirty"), true);

-			assertEquals(callTraces[i].contains( "doSave"), false);

-			callTraces[i].clear();

-		}

-		

-		//close all dirty editors with confirmation

-		//can't be tested		

-		

-		//close all dirty editors discarding them		

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

-			editors[i] = fActivePage.openEditor(files[i]);

-			mocks[i] = (MockEditorPart) editors[i];

-			mocks[i].setDirty(true);

-			callTraces[i] = mocks[i].getCallHistory();

-		}

-		assertEquals(fActivePage.closeAllEditors(false), true);

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

-			assertEquals(callTraces[i].contains("doSave"), false);

-		}

-	}

-

-	public void testSaveEditor() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		final IFile file = FileUtil.createFile("test.mock1", proj);

-		IEditorPart editor;

-		CallHistory callTrace;

-		MockEditorPart mock;

-

-		//create a clean editor

-		editor = fActivePage.openEditor(file);

-		mock = (MockEditorPart) editor;

-		callTrace = mock.getCallHistory();

-		callTrace.clear();

-

-	/*

-		javadoc: Saves the contents of the given editor if dirty. 

-		If not, this method returns without effect

-	*/

-		//save the clean editor with confirmation		

-		assertEquals(fActivePage.saveEditor(editor, true), true);

-		assertEquals(callTrace.contains("isDirty"), true);

-		assertEquals(callTrace.contains("doSave"), false);

-	

-	/*

-		javadoc: If confirm is true the user is prompted to confirm the command. 

-	*/

-		//can't be tested

-

-	/*

-		javadoc: Otherwise, the save happens without prompt. 

-	*/

-		//save the clean editor without confirmation

-		assertEquals(fActivePage.saveEditor(editor, false), true);

-		assertEquals(callTrace.contains( "isDirty"), true);

-		assertEquals(callTrace.contains("doSave"), false);

-

-		//save the dirty editor without confirmation

-		mock.setDirty(true);

-		callTrace.clear();

-		assertEquals(fActivePage.saveEditor(editor, false), true);

-		assertEquals(

-			callTrace.verifyOrder(new String[] { "isDirty", "doSave" }),

-			true);

-	}

-

-	public void testSaveAllEditors() throws Throwable {

-		int total = 3;

-

-		final IFile[] files = new IFile[total];

-		IEditorPart[] editors = new IEditorPart[total];

-		CallHistory[] callTraces = new CallHistory[total];

-		MockEditorPart[] mocks = new MockEditorPart[total];

-

-		proj = FileUtil.createProject("testOpenEditor");

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

-			files[i] = FileUtil.createFile(i + ".mock2", proj);

-			editors[i] = fActivePage.openEditor(files[i]);

-			mocks[i] = (MockEditorPart) editors[i];

-			callTraces[i] = mocks[i].getCallHistory();

-		}

-

-	/*

-		javadoc: If there are no dirty editors this method returns without effect.

-		javadoc: If confirm is true the user is prompted to confirm the command

-	*/

-		//save all clean editors with confirmation

-		assertEquals(fActivePage.saveAllEditors(true), true);

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

-			assertEquals(callTraces[i].contains( "isDirty"), true);

-			assertEquals(callTraces[i].contains( "doSave"), false);

-			callTraces[i].clear();

-		}

-

-		//save all dirty editors with confirmation can't be tested

-

-	/*

-		javadoc: Parameters: confirm - false to save unsaved changes without asking

-	*/

-		//save all clean editors without confirmation

-		assertEquals(fActivePage.saveAllEditors(false), true);

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

-			assertEquals(callTraces[i].contains( "isDirty"), true);

-			assertEquals(callTraces[i].contains( "doSave"), false);

-			callTraces[i].clear();

-		}

-

-		//save all dirty editors without confirmation

-		for (int i = 0; i < total; i++) 

-			mocks[i].setDirty(true);

-		assertEquals(fActivePage.saveAllEditors(false), true);

-		for (int i = 0; i < total; i++)

-			assertEquals(

-				callTraces[i].verifyOrder(new String[] { "isDirty", "doSave" }),

-				true);

-	}

-

-	public void testGetEditors() throws Throwable {

-		proj = FileUtil.createProject("testOpenEditor");

-		int totalBefore = fActivePage.getEditors().length;

-		int num = 3;

-		IEditorPart[] editors = new IEditorPart[num];

-

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

-			editors[i] = fActivePage.openEditor(FileUtil.createFile(i + ".mock2", proj));

-			assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editors[i]), true);

-		}

-		assertEquals(fActivePage.getEditors().length, totalBefore + num);

-

-		fActivePage.closeEditor(editors[0], false);

-		assertEquals(ArrayUtil.contains(fActivePage.getEditors(), editors[0]), false);

-		assertEquals(fActivePage.getEditors().length, totalBefore + num - 1);

-

-		fActivePage.closeAllEditors(false);

-		assertEquals(fActivePage.getEditors().length, 0);

-	}

-

-	public void testShowActionSet() {

-		String id = MockActionDelegate.ACTION_SET_ID;

-		WorkbenchPage page = (WorkbenchPage) fActivePage;

-

-		int totalBefore = page.getActionSets().length;

-		fActivePage.showActionSet(id);

-

-		IActionSetDescriptor[] sets = ((WorkbenchPage) fActivePage).getActionSets();

-		boolean found = false;

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

-			if (id.equals(sets[i].getId()))

-				found = true;

-		assertEquals(found, true);

-

-		//check that the method does not add an invalid action set to itself

-		id = IConstants.FakeID;

-		fActivePage.showActionSet(id);

-

-		sets = ((WorkbenchPage) fActivePage).getActionSets();

-		found = false;

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

-			if (id.equals(sets[i].getId()))

-				found = true;

-		assertEquals(found, false);

-		assertEquals(page.getActionSets().length, totalBefore + 1);

-	}

-

-	public void testHideActionSet() {

-		WorkbenchPage page = (WorkbenchPage) fActivePage;

-		int totalBefore = page.getActionSets().length;

-

-		String id = MockWorkbenchWindowActionDelegate.SET_ID;

-		fActivePage.showActionSet( id );

-		assertEquals(page.getActionSets().length, totalBefore + 1);

-

-		fActivePage.hideActionSet(id );

-		assertEquals(page.getActionSets().length, totalBefore );

-		

-		IActionSetDescriptor[] sets = page.getActionSets();

-		boolean found = false;

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

-			if (id.equals(sets[i].getId()))

-				found = true;

-		assertEquals(found, false);

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartSiteTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartSiteTest.java
deleted file mode 100644
index 75e90a6..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartSiteTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-

-/**

- * Tests the site for an IWorkbenchPart.

- */

-public abstract class IWorkbenchPartSiteTest extends UITestCase {

-

-	protected IWorkbenchWindow fWindow;

-	protected IWorkbenchPage fPage;

-	

-	/**

-	 * Constructor for IWorkbenchPartSiteTest

-	 */

-	public IWorkbenchPartSiteTest(String testName) {

-		super(testName);

-	}

-	

-	public void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	public void testGetId() throws Throwable {

-		// From Javadoc: "Returns the part registry extension id for 

-		// this workbench site's part."

-		

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		assertEquals(getTestPartId(), site.getId());

-	}

-

-	public void testGetPage() throws Throwable {

-		// From Javadoc: "Returns the page containing this workbench 

-		// site's part."

-		

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		assertEquals(fPage, site.getPage());

-	}

-

-	public void testGetPluginId() throws Throwable {

-		// From Javadoc: "Returns the unique identifier of the 

-		// plug-in that defines this workbench site's part."

-		

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		assertEquals(getTestPartPluginId(), site.getPluginId());

-	}

-

-	public void testGetRegisteredName() throws Throwable {

-		// From Javadoc: "Returns the registered name for this 

-		// workbench site's part."

-		

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		assertEquals(getTestPartName(), site.getRegisteredName());

-	}

-

-	public void testGetShell() throws Throwable {

-		// From Javadoc: "Returns the shell containing this 

-		// workbench site's part"

-		

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		assertEquals(fWindow.getShell(), site.getShell());

-	}

-

-	public void testGetWorkbenchWindow() throws Throwable {

-		// From Javadoc: "Returns the workbench window 

-		// containing this workbench site's part."

-		

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		assertEquals(fWindow, site.getWorkbenchWindow());

-	}

-	

-	public void testGetSelectionProvider() throws Throwable {

-		// From Javadoc: "'Get' returns the selection provider 

-		// for this workbench site's part.  

-		

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		assertTrue(part instanceof MockWorkbenchPart);

-		MockWorkbenchPart mock = (MockWorkbenchPart)part;

-		assertEquals(mock.getSelectionProvider(), site.getSelectionProvider());

-	}

-		

-	public void testSetSelectionProvider() throws Throwable {

-		// From Javadoc: 'Set' sets the selection provider.

-		

-		// Set selection provider to null.

-		IWorkbenchPart part = createTestPart(fPage);

-		IWorkbenchPartSite site = part.getSite();

-		site.setSelectionProvider(null);

-		assertNull(site.getSelectionProvider());

-		

-		// Set selection provider to real.

-		MockSelectionProvider provider = new MockSelectionProvider();

-		site.setSelectionProvider(provider);

-		assertEquals(provider, site.getSelectionProvider());

-	}

-

-	/**

-	 * Creates a test part in the page.	

-	 */

-	abstract protected IWorkbenchPart createTestPart(IWorkbenchPage page) 

-		throws Throwable;

-	

-	/**

-	 * Returns the expected id for a test part.

-	 */

-	abstract protected String getTestPartId() throws Throwable;

-

-	/**

-	 * Returns the expected name for a test part.

-	 */

-	abstract protected String getTestPartName() throws Throwable;

-

-	/**

-	 * Returns the expected id for a test part plugin.  Subclasses may

-	 * override this.

-	 */

-	protected String getTestPartPluginId() throws Throwable {

-		return "org.eclipse.ui.tests";

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartTest.java
deleted file mode 100644
index 29ee42e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPartTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-

-/**

- * This is a test for IWorkbenchPart.  Since IWorkbenchPart is an

- * interface this test verifies the IWorkbenchPart lifecycle rather

- * than the implementation.

- */

-public abstract class IWorkbenchPartTest extends UITestCase {

-

-	protected IWorkbenchWindow fWindow;

-	protected IWorkbenchPage fPage;

-	

-	/**

-	 * Constructor for IActionDelegateTest

-	 */

-	public IWorkbenchPartTest(String testName) {

-		super(testName);

-	}

-	

-	public void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	public void testOpenAndClose() throws Throwable {

-		// Open a part.

-		MockWorkbenchPart part = openPart(fPage);

-		CallHistory history = part.getCallHistory();

-		assertTrue(history.verifyOrder(new String[] {

-			"init", "createPartControl", "setFocus" }));

-		

-		// Close the part.

-		closePart(fPage, part);

-		assertTrue(history.verifyOrder(new String[] {

-			"init", "createPartControl", "setFocus", "dispose"}));

-	}

-	

-	/**

-	 * Opens a part.  Subclasses should override

-	 */

-	protected abstract MockWorkbenchPart openPart(IWorkbenchPage page) 

-		throws Throwable;

-	

-	/**

-	 * Closes a part.  Subclasses should override

-	 */

-	protected abstract void closePart(IWorkbenchPage page, MockWorkbenchPart part) 

-		throws Throwable;

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java
deleted file mode 100644
index da75ae5..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.jface.preference.PreferenceManager;

-import org.eclipse.swt.SWT;

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-/**

- * Tests the IWorkbench interface.

- */

-public class IWorkbenchTest extends UITestCase {

-

-	public IWorkbenchTest(String testName) {

-		super(testName);

-	}

-

-	/**

-	 * Tests the activation of two windows.

-	 */

-	public void testGetActiveWorkbenchWindow() throws Throwable {

-		IWorkbenchWindow win1, win2;

-

-		// PR 1GkD5O0 - Fails on linux.

-		String platform = SWT.getPlatform();

-		if (platform.equals("motif"))

-			return;

-		

-		// Test initial window.

-		win1 = fWorkbench.getActiveWorkbenchWindow();

-		assertNotNull(win1);

-

-		// Test open window.

-		win1 = openTestWindow();

-		assertEquals(win1, fWorkbench.getActiveWorkbenchWindow());

-

-		// Test open second window.

-		win2 = openTestWindow();

-		assertEquals(win2, fWorkbench.getActiveWorkbenchWindow());

-

-		// Test set focus.

-		win1.getShell().forceFocus();

-		assertEquals(win1, fWorkbench.getActiveWorkbenchWindow());

-

-		// Test set focus.

-		win2.getShell().forceFocus();

-		assertEquals(win2, fWorkbench.getActiveWorkbenchWindow());

-

-		// Cleanup in tearDown.

-	}

-

-	public void testGetEditorRegistry() throws Throwable {

-		IEditorRegistry reg = fWorkbench.getEditorRegistry();

-		assertNotNull(reg);

-	}

-

-	public void testGetPerspectiveRegistry() throws Throwable {

-		IPerspectiveRegistry reg = fWorkbench.getPerspectiveRegistry();

-		assertNotNull(reg);

-	}

-	

-	public void testGetPrefereneManager() throws Throwable {

-		PreferenceManager mgr = fWorkbench.getPreferenceManager();

-		assertNotNull(mgr);

-	}

-

-	public void testGetSharedImages() throws Throwable {

-		ISharedImages img = fWorkbench.getSharedImages();

-		assertNotNull(img);

-	}

-

-	public void testGetWorkbenchWindows() throws Throwable {

-		IWorkbenchWindow[] wins = fWorkbench.getWorkbenchWindows();

-		assertEquals(ArrayUtil.checkNotNull(wins), true);

-		int oldTotal = wins.length;

-		int num = 3;

-

-		IWorkbenchWindow[] newWins = new IWorkbenchWindow[num];

-		for (int i = 0; i < num; i++)

-			newWins[i] = openTestWindow();

-

-		wins = fWorkbench.getWorkbenchWindows();

-		for (int i = 0; i < num; i++)

-			assertTrue(ArrayUtil.contains(wins, newWins[i]));

-

-		assertEquals(wins.length, oldTotal + num);

-

-		closeAllTestWindows();

-		wins = fWorkbench.getWorkbenchWindows();

-		assertEquals(wins.length, oldTotal);

-	}

-

-	/**

-	 * openWorkbenchWindow(String, IAdaptable)

-	 */

-	public void testOpenWorkbenchWindow() throws Throwable {

-		// open a window with valid perspective 

-		IWorkbenchWindow win = null;

-		try {

-			win =

-				fWorkbench.openWorkbenchWindow(

-					EmptyPerspective.PERSP_ID,

-					ResourcesPlugin.getWorkspace());

-			assertNotNull(win);

-			// PR 1GkD5O0 - Fails on linux.

-			String platform = SWT.getPlatform();

-			if (!platform.equals("motif")) {

-				assertEquals(win, fWorkbench.getActiveWorkbenchWindow());

-			}

-			assertEquals(

-				EmptyPerspective.PERSP_ID,

-				win.getActivePage().getPerspective().getId());

-		} finally {

-			if (win != null)

-				win.close();

-		}

-

-		// open a window with invalid perspective. WorkbenchException is expected.

-		boolean exceptionOccured = false;

-		try {

-			win =

-				fWorkbench.openWorkbenchWindow("afdasfdasf", ResourcesPlugin.getWorkspace());

-		} catch (WorkbenchException ex) {

-			exceptionOccured = true;

-		}

-

-		assertEquals(exceptionOccured, true);

-	}

-

-	/**

-	 * openWorkbenchWindow(IAdaptable)

-	 */

-	public void testOpenWorkbenchWindow2() throws Throwable {

-		// open a window with valid perspective 

-		IWorkbenchWindow win = null;

-

-		try {

-			win = fWorkbench.openWorkbenchWindow(ResourcesPlugin.getWorkspace());

-			assertNotNull(win);

-

-			// PR 1GkD5O0 - Fails on linux.

-			String platform = SWT.getPlatform();

-			if (!platform.equals("motif")) {

-				assertEquals(win, fWorkbench.getActiveWorkbenchWindow());

-			}

-			String defaultID = fWorkbench.getPerspectiveRegistry().getDefaultPerspective();

-			assertEquals(win.getActivePage().getPerspective().getId(), defaultID);

-

-		} finally {

-			if (win != null)

-				win.close();

-		}

-	}

-

-	/**

-	 * close() couldn't be tested because calling close() would lead to early termination 

-	 * to entire test suites		

-	 */

-	public void testClose() {

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowActionDelegateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowActionDelegateTest.java
deleted file mode 100644
index 9891aee..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowActionDelegateTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.jdt.junit.util.*;

-

-/**

- * Tests the lifecycle for a window action delegate.

- */

-public class IWorkbenchWindowActionDelegateTest extends IActionDelegateTest {

-

-	/**

-	 * Constructor for IWorkbenchWindowActionDelegateTest

-	 */

-	public IWorkbenchWindowActionDelegateTest(String testName) {

-		super(testName);

-	}

-

-	public void testInit() throws Throwable {

-		// Run the action.

-		testRun();

-		

-		// Verify lifecycle.

-		// The init, selectionChanged, and run methods should

-		// be called, in that order.

-		MockActionDelegate delegate = getDelegate();

-		assertNotNull(delegate);

-		assertTrue(delegate.callHistory.verifyOrder( 

-			new String [] {"init", "selectionChanged", "run"}));

-	}

-	

-	public void testDispose() throws Throwable {

-		// Run the action.

-		testRun();

-		

-		// Get the action.

-		MockActionDelegate delegate = getDelegate();

-		assertNotNull(delegate);

-		

-		// Dispose action.

-		// Verify that the dispose method is called.

-		delegate.callHistory.clear();

-		removeAction();

-		assertTrue(delegate.callHistory.contains("dispose"));

-	}

-	

-	/**

-	 * @see IActionDelegateTest#createActionWidget()

-	 */

-	protected Object createActionWidget() throws Throwable {

-		fPage.showActionSet("org.eclipse.ui.tests.api.MockActionSet");

-		return null;

-	}

-

-	/**

-	 * @see IActionDelegateTest#runAction()

-	 */

-	protected void runAction(Object widget) throws Throwable {

-		ActionUtil.runActionWithLabel(this, fWindow, "Mock Action");

-	}

-

-	/**

-	 * @see IActionDelegateTest#fireSelection()

-	 */

-	protected void fireSelection(Object widget) throws Throwable {

-		MockViewPart view = (MockViewPart)fPage.showView(MockViewPart.ID);

-		view.fireSelection();

-	}

-	

-	/**

-	 * Removes the action.

-	 */

-	protected void removeAction() {

-		fPage.hideActionSet("org.eclipse.ui.tests.api.MockActionSet");

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowTest.java
deleted file mode 100644
index b846a61..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchWindowTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-public class IWorkbenchWindowTest extends UITestCase {

-

-	private IWorkbenchWindow fWin;

-

-	public IWorkbenchWindowTest(String testName) {

-		super(testName);

-	}

-

-	public void setUp() {

-		fWin = openTestWindow();

-	}

-

-	public void testClose() throws Throwable {		

-		assertEquals(fWin.close(), true);

-		assertEquals(ArrayUtil.contains(fWorkbench.getWorkbenchWindows(), fWin), false);

-	}

-

-	public void testGetActivePage() throws Throwable {

-		IWorkbenchPage page1, page2;

-		page1 = openTestPage(fWin);

-		assertEquals(fWin.getActivePage(), page1);

-

-		page2 = openTestPage(fWin);

-		assertEquals(fWin.getActivePage(), page2);

-

-		fWin.setActivePage(page1);

-		assertEquals(fWin.getActivePage(), page1);

-

-		fWin.setActivePage(page2);

-		assertEquals(fWin.getActivePage(), page2);

-

-		//no pages

-		closeAllPages(fWin);

-		assertNull(fWin.getActivePage());

-	}

-

-	public void testSetActivePage() throws Throwable {

-		openTestPage(fWin, 5);

-		IWorkbenchPage[] pages = fWin.getPages();

-

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

-			fWin.setActivePage(pages[i]);

-			assertEquals(pages[i], fWin.getActivePage());

-		}

-		

-		fWin.setActivePage( null );

-		assertNull( fWin.getActivePage() );

-	}

-

-	public void testGetPages() throws Throwable {

-		int totalBefore;

-		IWorkbenchPage[] pages, domainPages;

-

-		totalBefore = fWin.getPages().length;

-		int num = 5;

-		pages = openTestPage(fWin, num);

-		assertEquals(fWin.getPages().length, totalBefore + num);

-

-		domainPages = fWin.getPages();

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

-			assertEquals(ArrayUtil.contains(domainPages, pages[i]), true);

-

-		closeAllPages(fWin);

-		assertEquals(fWin.getPages().length, 0);

-	}

-

-	public void testGetShell() {

-		Shell sh = fWin.getShell();

-		assertNotNull(sh);

-	}

-	

-	public void testGetWorkbench() {

-		IWorkbenchWindow win = fWorkbench.getActiveWorkbenchWindow();

-		assertEquals(win.getWorkbench(), fWorkbench);

-	}

-

-	/**

-	 * tests openPage(String)

-	 */

-	public void testOpenPage() throws Throwable {

-		IWorkbenchPage page = null;

-		try {

-			page = fWin.openPage(ResourcesPlugin.getWorkspace());

-			assertNotNull(page);

-			assertEquals(fWin.getActivePage(), page);

-		} finally {

-			if (page != null)

-				page.close();

-		}

-	}

-

-	/**

-	 * tests openPage(String, IAdaptable)

-	 */

-	public void testOpenPage2() throws Throwable {

-		IWorkbenchPage page = null;

-		try {

-			page = fWin.openPage(EmptyPerspective.PERSP_ID, ResourcesPlugin.getWorkspace());

-			assertNotNull(page);

-			assertEquals(fWin.getActivePage(), page);

-			assertEquals(

-				fWin.getActivePage().getPerspective().getId(),

-				EmptyPerspective.PERSP_ID);

-		} finally {

-			if (page != null)

-				page.close();

-		}

-

-		//test openPage() fails

-		try {

-			page = fWin.openPage("*************", ResourcesPlugin.getWorkspace());

-			fail();

-		} catch (WorkbenchException ex) {

-		}

-

-		page.close();

-	}

-

-	public void testIsApplicationMenu() {

-		String[] ids = {

-			IWorkbenchActionConstants.M_FILE,

-			IWorkbenchActionConstants.M_VIEW,

-			IWorkbenchActionConstants.M_VIEW,

-			IWorkbenchActionConstants.M_WORKBENCH,

-		};

-

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

-			assertEquals( fWin.isApplicationMenu( ids[ i ] ), true );

-		

-		ids = new String[] {

-			IWorkbenchActionConstants.M_EDIT,

-			IWorkbenchActionConstants.M_HELP,

-			IWorkbenchActionConstants.M_LAUNCH

-		};

-

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

-			assertEquals( fWin.isApplicationMenu( ids[ i ] ), false );

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListContentProvider.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListContentProvider.java
deleted file mode 100644
index d8697ea..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListContentProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import java.util.List;

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

-

-public class ListContentProvider implements IStructuredContentProvider {

-

-	/**

-	 * @see IStructuredContentProvider#getElements(Object)

-	 */

-	public Object[] getElements(Object inputElement) {

-		if (inputElement instanceof List) {

-			return ((List)inputElement).toArray();

-		}

-		return new Object[0];

-	}

-

-	/**

-	 * @see IContentProvider#dispose()

-	 */

-	public void dispose() {

-	}

-

-	/**

-	 * @see IContentProvider#inputChanged(Viewer, Object, Object)

-	 */

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

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElement.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElement.java
deleted file mode 100644
index f745e27..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElement.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.IActionFilter;

-

-public class ListElement implements IAdaptable {

-

-	private String name;

-	private boolean flag;

-	

-	public ListElement(String name) {

-		this(name, false);

-	}

-	

-	public ListElement(String name, boolean flag) {

-		this.name = name;

-		this.flag = flag;

-	}

-	

-	public String toString() {

-		return name;

-	}

-

-	public String getName() {

-		return name;

-	}

-	

-	public boolean getFlag() {

-		return flag;

-	}

-		

-	public Object getAdapter(Class adapter) {

-		if (adapter == IActionFilter.class) {

-			return ListElementActionFilter.getSingleton();

-		}

-		return null;

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElementActionFilter.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElementActionFilter.java
deleted file mode 100644
index 3104e0e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListElementActionFilter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.IActionFilter;

-

-public class ListElementActionFilter implements IActionFilter {

-

-	private boolean called = false;

-	

-	public static final String ATTR_NAME = "name";

-	public static final String ATTR_FLAG = "flag";

-	public static final String VAL_TRUE = "true";

-	public static final String VAL_FALSE = "false";

-	

-	private static ListElementActionFilter singleton;

-

-	public static ListElementActionFilter getSingleton() {

-		if (singleton == null)

-			singleton = new ListElementActionFilter();

-		return singleton;

-	}

-		

-	private ListElementActionFilter() {

-		super();

-	}

-

-	/**

-	 * @see IActionFilter#testAttribute(Object, String, String)

-	 */

-	public boolean testAttribute(Object target, String name, String value) {

-		called = true;

-		ListElement le = (ListElement)target;

-		if (name.equals(ATTR_NAME)) {

-			return value.equals(le.getName());

-		} else if (name.equals(ATTR_FLAG)) {

-			boolean flag = le.getFlag();

-			if (flag)

-				return value.equals(VAL_TRUE);

-			else

-				return value.equals(VAL_FALSE);

-		}	

-		return false;

-	}

-	

-	public void clearCalled() {

-		called = false;

-	}

-	

-	public boolean getCalled() {

-		return called;

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListView.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListView.java
deleted file mode 100644
index 93abecc..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ListView.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockAction.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockAction.java
deleted file mode 100644
index eb27467..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

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

-import org.eclipse.ui.tests.TestPlugin;

-

-public class MockAction extends Action {

-	

-	private boolean hasRun = false;

-

-	/**

-	 * Constructor for MockAction

-	 */

-	protected MockAction(String text) {

-		super(text);

-		TestPlugin plugin = TestPlugin.getDefault();

-		setImageDescriptor(plugin.getImageDescriptor("anything.gif"));

-		setToolTipText(text);

-	}

-

-	/**

-	 * Constructor for MockAction

-	 */

-	protected MockAction(String text, ImageDescriptor image) {

-		super(text, image);

-		setToolTipText(text);

-	}

-	

-	public void run() {

-		hasRun = true;

-	}

-	

-	public void clearRun() {

-		hasRun = false;

-	}

-	

-	public boolean getRun() {

-		return hasRun;

-	}

-	

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockActionDelegate.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockActionDelegate.java
deleted file mode 100644
index 3c14168..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockActionDelegate.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

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

-import org.eclipse.ui.IActionDelegate;

-import org.eclipse.jdt.junit.util.*;

-

-public class MockActionDelegate implements IActionDelegate {

-

-	public CallHistory callHistory;

-	public static final String ACTION_SET_ID = "org.eclipse.ui.tests.api.MockActionSet";

-	public static MockActionDelegate lastDelegate;

-	

-	public MockActionDelegate() {

-		callHistory = new CallHistory(this);

-		lastDelegate = this;

-	}

-	

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		callHistory.add("run");

-	}

-	

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		callHistory.add("selectionChanged");

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionBarContributor.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionBarContributor.java
deleted file mode 100644
index f543c6b..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionBarContributor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.CallHistory;

-

-public class MockEditorActionBarContributor

-	implements IEditorActionBarContributor 

-{

-	protected CallHistory callHistory;

-	protected IActionBars bars;

-	protected IEditorPart target;

-	protected int ACTION_COUNT = 5;

-	protected MockAction [] actions;

-

-	/**

-	 * Constructor for MockEditorActionBarContributor

-	 */

-	public MockEditorActionBarContributor() {

-		super();

-		callHistory = new CallHistory(this);

-	}

-

-	public CallHistory getCallHistory() {

-		return callHistory;

-	}

-	

-	/**

-	 * @see IEditorActionBarContributor#init(IActionBars)

-	 */

-	public void init(IActionBars bars) {

-		callHistory.add("init");

-		this.bars = bars;

-		actions = new MockAction[ACTION_COUNT];

-		for (int nX = 0; nX < ACTION_COUNT; nX ++) {

-			actions[nX] = new MockAction(Integer.toString(nX));

-			if (nX % 2 > 0)

-				actions[nX].setEnabled(false);

-			bars.getToolBarManager().add(actions[nX]);

-		}

-		bars.updateActionBars();

-	}

-

-	/**

-	 * @see IEditorActionBarContributor#setActiveEditor(IEditorPart)

-	 */

-	public void setActiveEditor(IEditorPart targetEditor) {

-		callHistory.add("setActiveEditor");

-		target = targetEditor;

-	}

-	

-	/**

-	 * Returns the active editor.

-	 */

-	public IEditorPart getActiveEditor() {

-		return target;

-	}

-	

-	/**

-	 * Returns the action bars.

-	 */

-	public IActionBars getActionBars() {

-		return bars;

-	}

-	

-	/**

-	 * Returns the actions.

-	 */

-	public MockAction [] getActions() {

-		return actions;

-	}

-	

-	/**

-	 * Set the enablement for all actions.

-	 */

-	public void enableActions(boolean b) {

-		for (int nX = 0; nX < ACTION_COUNT; nX ++) {

-			actions[nX].setEnabled(b);

-		}

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionDelegate.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionDelegate.java
deleted file mode 100644
index 396dcce..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorActionDelegate.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-

-public class MockEditorActionDelegate extends MockActionDelegate

-	implements IEditorActionDelegate 

-{

-	private IEditorPart target;

-

-	/**

-	 * Constructor for MockEditorActionDelegate

-	 */

-	public MockEditorActionDelegate() {

-		super();

-	}

-

-	/**

-	 * @see IEditorActionDelegate#setActiveEditor(IAction, IEditorPart)

-	 */

-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {

-		callHistory.add("setActiveEditor");

-		target = targetEditor;

-	}

-	

-	/**

-	 * Returns the active editor.

-	 */

-	public IEditorPart getActiveEditor() {

-		return target;

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorPart.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorPart.java
deleted file mode 100644
index 720db37..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockEditorPart.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-public class MockEditorPart extends MockWorkbenchPart implements IEditorPart {

-

-	private static final String BASE = "org.eclipse.ui.tests.api.MockEditorPart";

-	public static final String ID1 = BASE + "1";

-	public static final String ID2 = BASE + "2";

-	public static final String NAME = "Mock Editor 1";

-

-	private IEditorInput input;

-	private boolean dirty = false;

-	private boolean saveNeeded = false;

-	

-	public MockEditorPart() {

-		super();

-	}

-	

-	/**

-	 * @see IEditorPart#doSave(IProgressMonitor)

-	 */

-	public void doSave(IProgressMonitor monitor) {

-		dirty = false;

-		callTrace.add( "doSave" );

-	}

-

-	/**

-	 * @see IEditorPart#doSaveAs()

-	 */

-	public void doSaveAs() {

-	}

-

-	/**

-	 * @see IEditorPart#getEditorInput()

-	 */

-	public IEditorInput getEditorInput() {

-		return input;

-	}

-

-	/**

-	 * @see IEditorPart#getEditorSite()

-	 */

-	public IEditorSite getEditorSite() {

-		return (IEditorSite)getSite();

-	}

-

-	/**

-	 * @see IEditorPart#gotoMarker(IMarker)

-	 */

-	public void gotoMarker(IMarker marker) {

-		callTrace.add( "gotoMarker" );	

-	}

-

-	/**

-	 * @see IEditorPart#init(IEditorSite, IEditorInput)

-	 */

-	public void init(IEditorSite site, IEditorInput input)

-		throws PartInitException {

-		this.input = input;

-		setSite(site);

-		callTrace.add( "init" );

-	}

-

-	/**

-	 * @see IEditorPart#isDirty()

-	 */

-	public boolean isDirty() {

-		callTrace.add( "isDirty" );

-		return dirty;

-	}

-

-	public void setDirty( boolean value )

-	{

-		dirty = value;	

-	}

-

-	/**

-	 * @see IEditorPart#isSaveAsAllowed()

-	 */

-	public boolean isSaveAsAllowed() {

-		return false;

-	}

-

-	/**

-	 * @see IEditorPart#isSaveOnCloseNeeded()

-	 */

-	public boolean isSaveOnCloseNeeded() {

-		callTrace.add( "isSaveOnCloseNeeded" );

-		return saveNeeded;

-	}

-	

-	public void setSaveNeeded( boolean value )

-	{

-		saveNeeded = value;

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPartListener.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPartListener.java
deleted file mode 100644
index 84161ee..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPartListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.jdt.junit.util.*;

-

-public class MockPartListener implements IPartListener {

-	private CallHistory callTrace;

-

-	public MockPartListener() {

-		callTrace = new CallHistory( this );

-	}

-

-	public CallHistory getCallHistory() {

-		return callTrace;

-	}

-

-	/**

-	 * @see IPartListener#partActivated(IWorkbenchPart)

-	 */

-	public void partActivated(IWorkbenchPart part) {

-		callTrace.add("partActivated");

-	}

-

-	/**

-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)

-	 */

-	public void partBroughtToTop(IWorkbenchPart part) {

-		callTrace.add("partBroughtToTop");

-	}

-

-	/**

-	 * @see IPartListener#partClosed(IWorkbenchPart)

-	 */

-	public void partClosed(IWorkbenchPart part) {

-		callTrace.add( "partClosed");

-	}

-

-	/**

-	 * @see IPartListener#partDeactivated(IWorkbenchPart)

-	 */

-	public void partDeactivated(IWorkbenchPart part) {

-		callTrace.add( "partDeactivated");

-	}

-

-	/**

-	 * @see IPartListener#partOpened(IWorkbenchPart)

-	 */

-	public void partOpened(IWorkbenchPart part) {

-		callTrace.add( "partOpened");

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPropertyListener.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPropertyListener.java
deleted file mode 100644
index e713b94..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockPropertyListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.IPropertyListener;

-import org.eclipse.jdt.junit.util.*;

-

-public class MockPropertyListener implements IPropertyListener {

-	private CallHistory callTrace;

-	private Object sourceMask;

-	private int sourceId;

-	

-	/**

-	 * @param source the event source that fires the event to this listener

-	 * @param id the property id for the event

-	 */

-	public MockPropertyListener( Object source, int id )

-	{

-		sourceMask = source;

-		sourceId = id;

-		callTrace = new CallHistory(this);

-	}	

-	

-	/**

-	 * @see IPropertyListener#propertyChanged(Object, int)

-	 */

-	public void propertyChanged(Object source, int propId) {	

-		if( source == sourceMask && propId == sourceId )	

-			callTrace.add( "propertyChanged" );

-	}

-	

-	public CallHistory getCallHistory()

-	{

-		return callTrace;

-	}	

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockSelectionProvider.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockSelectionProvider.java
deleted file mode 100644
index 40cc91a..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockSelectionProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import java.util.*;

-

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

-

-public class MockSelectionProvider implements ISelectionProvider {

-

-	private List listeners = new ArrayList(3);

-

-	/**

-	 * Fires out a selection to all listeners.

-	 */

-	public void fireSelection() {

-		fireSelection(new SelectionChangedEvent(this,

-			StructuredSelection.EMPTY));

-	}

-		

-	/**

-	 * Fires out a selection to all listeners.

-	 */

-	public void fireSelection(SelectionChangedEvent event) {

-		Iterator iter = listeners.iterator();

-		while (iter.hasNext()) {

-			((ISelectionChangedListener)iter.next()).selectionChanged(event);

-		}

-	}

-		

-	/**

-	 * @see ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener)

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		listeners.add(listener);

-	}

-

-	/**

-	 * @see ISelectionProvider#getSelection()

-	 */

-	public ISelection getSelection() {

-		return null;

-	}

-

-	/**

-	 * @see ISelectionProvider#removeSelectionChangedListener(ISelectionChangedListener)

-	 */

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		listeners.remove(listener);

-	}

-

-	/**

-	 * @see ISelectionProvider#setSelection(ISelection)

-	 */

-	public void setSelection(ISelection selection) {

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewActionDelegate.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewActionDelegate.java
deleted file mode 100644
index 182e058..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewActionDelegate.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

-import org.eclipse.ui.IViewPart;

-

-/**

- * This mock is used to test IViewActionDelegate lifecycle.

- */

-public class MockViewActionDelegate extends MockActionDelegate 

-	implements IViewActionDelegate

-{

-	/**

-	 * Constructor for MockWorkbenchWindowActionDelegate

-	 */

-	public MockViewActionDelegate() {

-		super();

-	}

-

-	/**

-	 * @see IViewActionDelegate#init(IViewPart)

-	 */

-	public void init(IViewPart view) {

-		callHistory.add("init");

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewPart.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewPart.java
deleted file mode 100644
index 1fb49ae..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockViewPart.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

-import org.eclipse.ui.*;

-

-public class MockViewPart extends MockWorkbenchPart implements IViewPart {	

-	public static String ID = "org.eclipse.ui.tests.api.MockViewPart";

-	public static String ID2 = ID + "2";

-	public static String ID3 = ID + "3";

-	public static String NAME = "Mock View 1";

-

-	public MockViewPart()

-	{

-		super();

-	}

-	

-	/**

-	 * @see IViewPart#getViewSite()

-	 */

-	public IViewSite getViewSite() {

-		return (IViewSite)getSite();

-	}

-

-	/**

-	 * @see IViewPart#init(IViewSite)

-	 */

-	public void init(IViewSite site) throws PartInitException {

-		setSite(site);

-		callTrace.add("init" );		

-	}

-

-	/**

-	 * @see IViewPart#init(IViewSite, IMemento)

-	 */

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

-		setSite(site);

-		callTrace.add("init" );

-	}

-

-	/**

-	 * @see IViewPart#saveState(IMemento)

-	 */

-	public void saveState(IMemento memento) {

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchPart.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchPart.java
deleted file mode 100644
index 6ba7403..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.ui.tests.api;

-

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

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

-import org.eclipse.swt.SWT;

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

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

-

-public abstract class MockWorkbenchPart implements IWorkbenchPart,

-	IExecutableExtension

-{	

-	protected CallHistory callTrace;

-		

-	private IPropertyListener myListener;

-	private Composite myParent;		

-	private IWorkbenchPartSite site;

-	private String title;

-	private MockSelectionProvider selectionProvider;

-	private IConfigurationElement config;

-	

-	public MockWorkbenchPart() {		

-		callTrace = new CallHistory(this);

-		selectionProvider = new MockSelectionProvider();

-	}

-	

-	public CallHistory getCallHistory()

-	{

-		return callTrace;

-	}	

-

-	public ISelectionProvider getSelectionProvider() {

-		return selectionProvider;

-	}

-	

-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

-		this.config = config;

-		title = (String)config.getAttribute("name");

-	}

-

-	public IConfigurationElement getConfig() {

-		return config;

-	}

-		

-	public void setSite(IWorkbenchPartSite site) {

-		this.site = site;

-		site.setSelectionProvider(selectionProvider);

-	}

-	

-	public IWorkbenchPartSite getSite() {

-		return site;

-	}

-	

-	/**

-	 * @see IWorkbenchPart#addPropertyListener(IPropertyListener)

-	 */

-	public void addPropertyListener(IPropertyListener listener) {

-		myListener = listener;	

-	}

-

-	/**

-	 * @see IWorkbenchPart#createPartControl(Composite)

-	 */

-	public void createPartControl(Composite parent) {

-		myParent = parent;

-		callTrace.add("createPartControl" );

-		Label label = new Label(parent, SWT.NONE);

-		label.setText(title);

-	}

-

-	/**

-	 * @see IWorkbenchPart#dispose()

-	 */

-	public void dispose() {

-		callTrace.add("dispose" );

-	}

-

-	/**

-	 * @see IWorkbenchPart#getTitle()

-	 */

-	public String getTitle() {

-		return title;

-	}

-

-	/**

-	 * @see IWorkbenchPart#getTitleImage()

-	 */

-	public Image getTitleImage() {

-		return null;

-	}

-

-	/**

-	 * @see IWorkbenchPart#getTitleToolTip()

-	 */

-	public String getTitleToolTip() {

-		return title;

-	}

-

-	/**

-	 * @see IWorkbenchPart#removePropertyListener(IPropertyListener)

-	 */

-	public void removePropertyListener(IPropertyListener listener) {

-		myListener = null;

-	}

-

-	/**

-	 * @see IWorkbenchPart#setFocus()

-	 */

-	public void setFocus() {

-		callTrace.add("setFocus" );

-	}

-

-	/**

-	 * @see IAdaptable#getAdapter(Class)

-	 */

-	public Object getAdapter(Class arg0) {

-		return null;

-	}

-	

-	/**

-	 * Fires a selection out.

-	 */

-	public void fireSelection() {

-		selectionProvider.fireSelection();

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchWindowActionDelegate.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchWindowActionDelegate.java
deleted file mode 100644
index bcae17e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/MockWorkbenchWindowActionDelegate.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.IWorkbenchWindowActionDelegate;

-

-

-public class MockWorkbenchWindowActionDelegate extends MockActionDelegate 

-	implements IWorkbenchWindowActionDelegate

-{

-	public static MockWorkbenchWindowActionDelegate lastDelegate;

-	public static String SET_ID = "org.eclipse.ui.tests.api.MockActionSet";

-	public static String ID = "org.eclipse.ui.tests.api.MockWindowAction";

-

-	/**

-	 * Constructor for MockWorkbenchWindowActionDelegate

-	 */

-	public MockWorkbenchWindowActionDelegate() {

-		super();

-		lastDelegate = this;

-	}

-

-	/**

-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)

-	 */

-	public void init(IWorkbenchWindow window) {

-		callHistory.add("init");

-	}

-

-	/**

-	 * @see IWorkbenchWindowActionDelegate#dispose()

-	 */

-	public void dispose() {

-		callHistory.add("dispose");

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/PlatformUITest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/PlatformUITest.java
deleted file mode 100644
index 0fdb22d..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/PlatformUITest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import junit.framework.*;

-import org.eclipse.ui.*;

-

-/**

- * Tests the PlatformUI class.

- */

-public class PlatformUITest extends TestCase {

-

-	public PlatformUITest(String testName) {

-		super(testName);

-	}

-

-	public void testGetWorkbench() throws Throwable {

-		// From Javadoc: "Returns the workbench interface."

-		IWorkbench wb = PlatformUI.getWorkbench();

-		assertNotNull(wb);

-	}

-	

-	public void testPLUGIN_ID() {

-		// From Javadoc: "Identifies the workbench plugin."

-		assertNotNull(PlatformUI.PLUGIN_ID);

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionCreateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionCreateTest.java
deleted file mode 100644
index 87a2555..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionCreateTest.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionPerspective.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionPerspective.java
deleted file mode 100644
index 9a7b21e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionPerspective.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.ui.*;

-

-/**

- * This class tests the persistance of a perspective.

- */

-public class SessionPerspective implements IPerspectiveFactory {

-

-	public static String ID = "org.eclipse.ui.tests.api.SessionPerspective";

-	

-	/**

-	 * @see IPerspectiveFactory#createInitialLayout(IPageLayout)

-	 */

-	public void createInitialLayout(IPageLayout layout) {

-		String editorArea = layout.getEditorArea();

-		layout.addView(SessionView.VIEW_ID, IPageLayout.LEFT,

-			0.33f, editorArea);

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionRestoreTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionRestoreTest.java
deleted file mode 100644
index d4f4f6d..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionRestoreTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import org.eclipse.jdt.junit.util.*;

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

-import org.eclipse.ui.*;

-

-/**

- * SessionRestoreTest runs the second half of our session

- * presistance tests.

- * 

-*/

-public class SessionRestoreTest extends UITestCase {

-

-	/** 

-	 * Construct an instance.

-	 */

-	public SessionRestoreTest(String arg) {

-		super(arg);

-	}

-		

-	/**

-	 * Generates a session state in the workbench.

-	 */

-	public void testRestoreSession() throws Throwable {

-		IWorkbenchWindow [] windows;

-		IWorkbenchPage [] pages;

-		IWorkbenchPage page;

-		

-		// Get windows.

-		windows = fWorkbench.getWorkbenchWindows();

-		assertEquals(windows.length, 3);

-		

-		// First window contains empty perspective.

-		pages = windows[0].getPages();

-		assertEquals(pages.length, 1);

-		assertEquals(pages[0].getPerspective().getId(), EmptyPerspective.PERSP_ID);

-		

-		// Second window contains empty + session.

-		pages = windows[1].getPages();

-		assertEquals(pages.length, 2);

-		assertEquals(pages[0].getPerspective().getId(), EmptyPerspective.PERSP_ID);

-		assertEquals(pages[1].getPerspective().getId(), SessionPerspective.ID);

-		testSessionView(pages[1]);

-		

-		// Third window contains 2 sessions.

-		pages = windows[2].getPages();

-		assertEquals(pages.length, 2);

-		assertEquals(pages[0].getPerspective().getId(), SessionPerspective.ID);

-		assertEquals(pages[1].getPerspective().getId(), SessionPerspective.ID);

-		testSessionView(pages[0]);

-		testSessionView(pages[1]);

-		

-		// Last page contains 3 editors.

-		IEditorPart [] editors = pages[1].getEditors();

-		assertEquals(editors.length, 3);

-		testSessionEditor(editors[0], SessionCreateTest.TEST_FILE_1);

-		testSessionEditor(editors[1], SessionCreateTest.TEST_FILE_2);

-		testSessionEditor(editors[2], SessionCreateTest.TEST_FILE_3);

-	}

-	

-	/**

-	 * Tests the session view within a page.

-	 */

-	private void testSessionView(IWorkbenchPage page) {

-		IViewPart view = page.findView(SessionView.VIEW_ID);

-		assertNotNull(view);

-		SessionView sessionView = (SessionView)view;

-		sessionView.testMementoState(this);

-	}

-

-	/**

-	 * Tests the state of a session editor.

-	 */

-	private void testSessionEditor(IEditorPart part, String fileName) {

-		IEditorSite site = part.getEditorSite();

-		assertEquals(site.getId(), MockEditorPart.ID1);

-		IEditorInput input = part.getEditorInput();

-		assertTrue(input instanceof IFileEditorInput);

-		IFile file = ((IFileEditorInput)input).getFile();

-		assertEquals(fileName, file.getName());

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionView.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionView.java
deleted file mode 100644
index c68a649..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/SessionView.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.eclipse.ui.tests.api;

-

-import junit.framework.TestCase;

-import org.eclipse.ui.*;

-

-/**

- * This view is used to test the creation and restoration of 

- * view state between sessions.

- */

-public class SessionView extends MockViewPart {

-

-	private IMemento memento;

-	

-	public static String VIEW_ID = "org.eclipse.ui.tests.api.SessionView";

-	/**

-	 * Constructor for SessionView

-	 */

-	public SessionView() {

-		super();

-	}

-

-	/**

-	 * @see IViewPart#init(IViewSite, IMemento)

-	 */

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

-		super.init(site, memento);

-		this.memento = memento;

-	}

-

-	/**

-	 * Create an IMemento.

-	 */

-	public void saveState(IMemento memento) {

-		createMementoState(memento);

-	}

-	

-	/**

-	 * Creates an IMemento.

-	 */

-	private void createMementoState(IMemento memento) {

-		// Create float, integer and string.

-		memento.putFloat("float", 0.50f);

-		memento.putInteger("integer", 50);

-		memento.putString("string", "50");

-		

-		// Create a single child.

-		IMemento child = memento.createChild("single");

-		child.putInteger("id", 1);

-		

-		// Create multiple children.

-		int count = 10;

-		for (int nX = 0; nX < count; nX ++) {

-			child = memento.createChild("multiple");

-			child.putInteger("id", nX);

-		}

-		memento.putInteger("multiple.count", count);

-	}

-	

-	/**

-	 * Restore an IMemento.

-	 */

-	public void testMementoState(TestCase testCase) {

-		// Verify that the memento was passed to us in

-		// constructor.

-		testCase.assertNotNull(memento);

-	

-		// Read float.	

-		Float bigFloat = memento.getFloat("float");

-		testCase.assertNotNull(bigFloat);

-		testCase.assertEquals(bigFloat.floatValue(), 0.50f, 0.0001);

-		

-		// Read int.	

-		Integer bigInt = memento.getInteger("integer");

-		testCase.assertEquals(bigInt, new Integer(50));

-		

-		// Read string.

-		String str = memento.getString("string");

-		testCase.assertEquals(str, "50");

-		

-		// Read single child.

-		IMemento child = memento.getChild("single");

-		testCase.assertNotNull(child);

-		bigInt = child.getInteger("id");

-		testCase.assertEquals(bigInt, new Integer(1));

-		

-		// Read multiple children.

-		bigInt = memento.getInteger("multiple.count");

-		testCase.assertNotNull(bigInt);

-		int count = bigInt.intValue();

-		IMemento [] children = memento.getChildren("multiple");

-		testCase.assertEquals(count, children.length);

-		for (int nX = 0; nX < count; nX ++) {

-			child = children[nX];

-			testCase.assertNotNull(child);

-			bigInt = child.getInteger("id");

-			testCase.assertEquals(bigInt, new Integer(nX));

-		}

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportOperationTestCase.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportOperationTestCase.java
deleted file mode 100644
index 083579c..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportOperationTestCase.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.ui.tests.datatransfer;

-

-import java.io.File;

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Properties;

-

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

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

-import org.eclipse.ui.dialogs.IOverwriteQuery;

-import org.eclipse.jdt.junit.util.FileUtil;

-import org.eclipse.jdt.junit.util.UITestCase;

-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;

-import org.eclipse.ui.wizards.datatransfer.ImportOperation;

-

-public class ImportOperationTestCase

-	extends UITestCase

-	implements IOverwriteQuery {

-

-	private String localDirectory;

-

-	private String[] directoryNames = { "dir1", "dir2" };

-

-	private String[] fileNames = { "file1.txt", "file2.txt" };

-	

-	private IProject project;

-

-	public ImportOperationTestCase(String testName) {

-		super(testName);

-	}

-

-	public void setUp() throws Exception {

-		Class testClass =

-			Class.forName("org.eclipse.ui.tests.datatransfer.ImportOperationTestCase");

-		InputStream stream = testClass.getResourceAsStream("tests.ini");

-		Properties properties = new Properties();

-		properties.load(stream);

-		localDirectory = properties.getProperty("localSource");

-		setUpDirectory();

-		super.setUp();

-	}

-

-	public void testImportAll() throws Exception {

-

-		project = FileUtil.createProject("ImportAll");

-		File element = new File(localDirectory);

-		List importElements = new ArrayList();

-		importElements.add(element);

-		ImportOperation operation =

-			new ImportOperation(

-				project.getFullPath(),

-				FileSystemStructureProvider.INSTANCE,

-				this,

-				importElements);

-		openTestWindow().run(true,true,operation);

-	}

-

-	/**

-	 * Set up the directories and files used for the test.

-	 */

-

-	private void setUpDirectory() throws IOException {

-		File rootDirectory = new File(localDirectory);

-		rootDirectory.mkdir();

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

-			createSubDirectory(localDirectory, directoryNames[i]);

-		}

-	}

-

-	private void createSubDirectory(String parentName, String newDirName)

-		throws IOException {

-		String newDirPath = parentName + File.separatorChar + newDirName;

-		File newDir = new File(newDirPath);

-		newDir.mkdir();

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

-			createFile(newDirPath, fileNames[i]);

-		}

-	}

-

-	private void createFile(String parentName, String filePath)

-		throws IOException {

-		String newFilePath = parentName + File.separatorChar + filePath;

-		File newFile = new File(newFilePath);

-		newFile.createNewFile();

-	}

-

-	/*

-	 * @see IOverwriteQuery#queryOverwrite(String)

-	 */

-	public String queryOverwrite(String pathString) {

-		//Always return an empty String - we aren't

-		//doing anything interesting

-		return "";

-	}

-	

-	/**

-	 * Tear down. Delete the project we created and all of the

-	 * files on the file system.

-	 */

-	public void tearDown() throws Exception {

-		super.tearDown();

-		try {

-			project.delete(true,true,null);

-			File topDirectory = new File(localDirectory);

-			deleteDirectory(topDirectory);

-		}

-		catch (CoreException e) {

-			fail(e.toString());

-		}

-	}

-	

-	private void deleteDirectory(File directory){

-		File[] children = directory.listFiles();

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

-			if(children[i].isDirectory())

-				deleteDirectory(children[i]);

-			else

-				children[i].delete();

-		}

-		directory.delete();

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/tests.ini b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/tests.ini
deleted file mode 100644
index e470039..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/tests.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-localSource=c:/test

-networkSource=q:/viper/team/test
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferMessagesCopy.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferMessagesCopy.java
deleted file mode 100644
index 494e25c..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferMessagesCopy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-/* THIS IS A COPY OF DataTransferMessages

- * It is made available for UI testing.

- */

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-/**

- * Utility class which helps managing messages

- */

-public class DataTransferMessagesCopy {

-	private static final String RESOURCE_BUNDLE= "org.eclipse.ui.wizards.datatransfer.messages";//$NON-NLS-1$

-	private static ResourceBundle bundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);

-private DataTransferMessagesCopy(){

-	// prevent instantiation of class

-}

-/**

- * Returns the formatted message for the given key in

- * the resource bundle. 

- *

- * @param key the resource name

- * @param args the message arguments

- * @return the string

- */	

-public static String format(String key, Object[] args) {

-	return MessageFormat.format(getString(key),args);

-}

-/**

- * Returns the resource object with the given key in

- * the resource bundle. If there isn't any value under

- * the given key, the key is returned.

- *

- * @param key the resource name

- * @return the string

- */	

-public static String getString(String key) {

-	try {

-		return bundle.getString(key);

-	} catch (MissingResourceException e) {

-		return key;

-	}

-}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferTestStub.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferTestStub.java
deleted file mode 100644
index 372586e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DataTransferTestStub.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

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

-import org.eclipse.jface.wizard.IWizardPage;

-import org.eclipse.ui.IWorkbench;

-

-/**

- * FOR USE BY TESTS ONLY!

- * <p>

- * Stub class that provides access to classes visible to the package

- * <code>org.eclipse.ui.wizards.datatransfer</code>.  For the purpose

- * of testing.

- * </p>

- * @private

- */

-public class DataTransferTestStub {

-	//Prevent instantiation

-	private DataTransferTestStub(){}

-	

-	/**

-	 * Gives access to an instance of WizardFileSystemResourceExportPage1.

-	 * @return IWizardPage an instance of WizardFileSystemResourceExportPage1

-	 */

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public static IWizardPage newFileSystemResourceExportPage1(IStructuredSelection selection) {

-		return new WizardFileSystemResourceExportPage1(selection);

-	}

- */

-	/**

-	 * Gives access to an instance of WizardFileSystemResourceImportPage1.

-	 * @return IWizardPage an instance of WizardFileSystemResourceImportPage1

-	 */

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public static IWizardPage newFileSystemResourceImportPage1(IWorkbench workbench, IStructuredSelection selection) {

-		return new WizardFileSystemResourceImportPage1(workbench, selection);

-	}

- */

-	/**

-	 * Gives access to an instance of WizardZipFileResourceExportPage1.

-	 * @return IWizardPage an instance of WizardZipFileResourceExportPage1

-	 */

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public static IWizardPage newZipFileResourceExportPage1(IStructuredSelection selection) {

-		return new WizardZipFileResourceExportPage1(selection);

-	}

- */

-	/**

-	 * Gives access to an instance of WizardZipFileResourceImportPage1.

-	 * @return IWizardPage an instance of WizardZipFileResourceImportPage1

-	 */

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public static IWizardPage newZipFileResourceImportPage1(IStructuredSelection selection) {

-		return new WizardZipFileResourceExportPage1(selection);

-	}

- */

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/NavigatorTestStub.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/NavigatorTestStub.java
deleted file mode 100644
index 5059bd2..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/NavigatorTestStub.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

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

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

-

-/**

- * FOR USE BY TESTS ONLY!

- * <p>

- * Stub class that provides access to classes visible to the package

- * <code>org.eclipse.ui.views.navigator</code>.  For the purpose of

- * testing.

- * </p>

- * @private

- */

-

-public class NavigatorTestStub {

-	//Prevent instantiation

-	private NavigatorTestStub(){}

-	

-	/**

-	 * Gives access to an instance of GotoResourceDialog.

-	 * @return GotoResourceDialog an instance of GotoResourceDialog.

-	 */

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public static GotoResourceDialog newGotoResourceDialog(Shell parentShell,IResource[] resources) {

-		return new GotoResourceDialog(parentShell, resources);

-	}

- */

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PreferenceDialogWrapper.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PreferenceDialogWrapper.java
deleted file mode 100644
index 438d3ec..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PreferenceDialogWrapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import org.eclipse.jface.preference.IPreferenceNode;

-import org.eclipse.jface.preference.PreferenceDialog;

-import org.eclipse.jface.preference.PreferenceManager;

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

-

-public class PreferenceDialogWrapper extends PreferenceDialog {

-	

-	public PreferenceDialogWrapper(Shell parentShell, PreferenceManager manager) {

-		super(parentShell, manager);

-	}

-	protected boolean showPage(IPreferenceNode node) {

-		return super.showPage(node);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PropertyDialogWrapper.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PropertyDialogWrapper.java
deleted file mode 100644
index 3892cea..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/PropertyDialogWrapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import org.eclipse.jface.preference.IPreferenceNode;

-import org.eclipse.jface.preference.PreferenceManager;

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

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

-import org.eclipse.ui.internal.dialogs.PropertyDialog;

-

-

-public class PropertyDialogWrapper extends PropertyDialog {

-	

-	public PropertyDialogWrapper(Shell parentShell, PreferenceManager manager, ISelection selection) {

-		super(parentShell, manager, selection);

-	}

-	protected boolean showPage(IPreferenceNode node) {

-		return super.showPage(node);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceMessagesCopy.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceMessagesCopy.java
deleted file mode 100644
index ca72d4d..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceMessagesCopy.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-/**

- * Utility class which helps managing messages

- */

-public class ResourceMessagesCopy {

-	private static final String RESOURCE_BUNDLE= "org.eclipse.ui.wizards.newresource.messages";//$NON-NLS-1$

-	private static ResourceBundle bundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-private ResourceMessagesCopy(){

-	// prevent instantiation of class

-}

-/**

- * Returns the formatted message for the given key in

- * the resource bundle. 

- *

- * @param key the resource name

- * @param args the message arguments

- * @return the string

- */	

-public static String format(String key, Object[] args) {

-	return MessageFormat.format(getString(key),args);

-}

-/**

- * Returns the resource object with the given key in

- * the resource bundle. If there isn't any value under

- * the given key, the key is returned.

- *

- * @param key the resource name

- * @return the string

- */	

-public static String getString(String key) {

-	try {

-		return bundle.getString(key);

-	} catch (MissingResourceException e) {

-		return key;

-	}

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceNavigatorMessagesCopy.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceNavigatorMessagesCopy.java
deleted file mode 100644
index af38eba..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceNavigatorMessagesCopy.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-/* THIS IS A COPY OF ResourceNavigatorMessages Class

- * It is made available for UI testing.

- */

-

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-/**

- * Utility class which helps managing messages

- */

-public class ResourceNavigatorMessagesCopy {

-	private static final String RESOURCE_BUNDLE= "org.eclipse.ui.views.navigator.messages";//$NON-NLS-1$

-	private static ResourceBundle bundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);

-	

-private ResourceNavigatorMessagesCopy(){

-	// prevent instantiation of class

-}

-/**

- * Returns the formatted message for the given key in

- * the resource bundle. 

- *

- * @param key the resource name

- * @param args the message arguments

- * @return the string

- */	

-public static String format(String key, Object[] args) {

-	return MessageFormat.format(getString(key),args);

-}

-/**

- * Returns the resource object with the given key in

- * the resource bundle. If there isn't any value under

- * the given key, the key is returned.

- *

- * @param key the resource name

- * @return the string

- */	

-public static String getString(String key) {

-	try {

-		return bundle.getString(key);

-	} catch (MissingResourceException e) {

-		return key;

-	}

-}

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TaskListTestStub.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TaskListTestStub.java
deleted file mode 100644
index 7592d8d..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TaskListTestStub.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

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

- 

-/**

- * FOR USE BY TESTS ONLY!

- * <p>

- * Stub class that provides access to classes visible to the package

- * <code>org.eclipse.ui.views.tasklist</code>.  For the purpose

- * of testing.

- * </p>

- * @private

- */

-public class TaskListTestStub {

-	//Prevent instantiation

-	private TaskListTestStub(){}

-	

-	/**

-	 * Gives access to an instance of FiltersDialog.

-	 * @return FiltersDialog an instance of FiltersDialog.

-	 */

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public static FiltersDialog newFiltersDialog(Shell parentShell) {

-		return new FiltersDialog(parentShell);

-	}

- */

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextEditorTestStub.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextEditorTestStub.java
deleted file mode 100644
index d7897b9..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextEditorTestStub.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

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

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

-

-/**

- * FOR USE BY TESTS ONLY!

- * <p>

- * Stub class that provides access to classes visible to the package

- * <code>org.eclipse.ui.texteditor</code>.  For the purpose of

- * testing.

- * </p>

- * @private

- */

-

-public class TextEditorTestStub {

-	//Prevent instantiation

-	private TextEditorTestStub(){}

-	

-	/**

-	 * Gives access to an instance of FindReplaceDialog.

-	 * @return FindReplaceDialog an instance of FindReplaceDialog.

-	 */

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public static FindReplaceDialog newFindReplaceDialog(Shell parentShell) {

-		return new FindReplaceDialog(parentShell);

-	}

- */

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java
deleted file mode 100644
index d73d128..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import junit.framework.*;

-import junit.textui.TestRunner;

-

-

-/**

- * Test all areas of the UI.

- */

-public class UIAutomatedSuite extends TestSuite {

-

-	/**

-	 * Returns the suite.  This is required to

-	 * use the JUnit Launcher.

-	 */

-	public static Test suite() {

-		return new UIAutomatedSuite();

-	}

-	

-	/**

-	 * Construct the test suite.

-	 */

-	public UIAutomatedSuite() {

-		addTest(new TestSuite(UIDialogsAuto.class));

-		addTest(new TestSuite(UIWizardsAuto.class));

-		addTest(new TestSuite(UIPreferencesAuto.class));

-		addTest(new TestSuite(UIMessageDialogsAuto.class));

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogs.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogs.java
deleted file mode 100644
index f119ae7..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogs.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import junit.framework.TestCase;

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

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

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

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

-import org.eclipse.ui.*;

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

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

-import org.eclipse.ui.internal.dialogs.*;

-import org.eclipse.ui.internal.model.AdaptableList;

-import org.eclipse.ui.internal.registry.*;

-import org.eclipse.jdt.junit.util.DialogCheck;

-import org.eclipse.ui.model.WorkbenchContentProvider;

-

-public class UIDialogs extends TestCase {

-	private static final String PROJECT_SELECTION_MESSAGE = WorkbenchMessages.getString("BuildOrderPreference.selectOtherProjects");

-	private static final String FILTER_SELECTION_MESSAGE = ResourceNavigatorMessagesCopy.getString("FilterSelection.message");

-

-	public UIDialogs(String name) {

-		super(name);

-	}

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	private IWorkbench getWorkbench() {

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

-	}

-	public void testAbout() {

-		Dialog dialog = new AboutDialog( getShell() );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testAddProjects() {

-		Dialog dialog = new ListSelectionDialog(getShell(),

-			null,

-			new SimpleListContentProvider(),

-			new LabelProvider(),

-			PROJECT_SELECTION_MESSAGE

-		);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testCopyMoveProject() {

-		IProject dummyProject = ResourcesPlugin.getWorkspace().getRoot().getProject("DummyProject");

-		Dialog dialog = new ProjectLocationSelectionDialog(getShell(), dummyProject);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testCopyMoveResource() {

-		Dialog dialog = new ContainerSelectionDialog( getShell(), null, true, WorkbenchMessages.getString("CopyResourceAction.selectDestination") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testEditActionSetsDialog() {

-		Dialog dialog;

-		Perspective persp = null;

-		//Test perspective: use current perspective of test case

-		try {/*fixme: should try to get current perspective, or default; currently only

-			 gets first perspective in the registry.*/

-			persp = new Perspective((PerspectiveDescriptor)getWorkbench().getPerspectiveRegistry().getPerspectives()[0],

-			                                    (WorkbenchPage)getWorkbench().getActiveWorkbenchWindow().getActivePage()

-			);

-			dialog = new ActionSetSelectionDialog(getShell(),  persp);

-		} catch (WorkbenchException e) {

-			dialog = null;

-		}

-		DialogCheck.assertDialog(dialog, this);

-		if (persp != null) {

-			persp.dispose();

-		}

-	}

-	public void testEditorSelection() {

-		Dialog dialog = new EditorSelectionDialog( getShell() );

-		DialogCheck.assertDialog(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testFindReplace() {

-		Dialog dialog = TextEditorTestStub.newFindReplaceDialog( getShell() );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testGotoResource() {

-		Dialog dialog = NavigatorTestStub.newGotoResourceDialog(getShell(), new IResource[0]);

-		DialogCheck.assertDialog(dialog, this);

-	}

- */

-	public void testNavigatorFilter() {

-		Dialog dialog = new ListSelectionDialog(getShell(), null, new SimpleListContentProvider(), new LabelProvider(), FILTER_SELECTION_MESSAGE);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNewFileType() {

-		Dialog dialog = new FileExtensionDialog( getShell() );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testProgressInformation() {

-		ProgressMonitorDialog dialog = new ProgressMonitorDialog( getShell() );

-		dialog.setBlockOnOpen(true);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSaveAll() {

-		YesNoCancelListSelectionDialog dialog = new YesNoCancelListSelectionDialog(

-			getShell(),

-			new AdaptableList(),

-			new WorkbenchContentProvider(),

-			new WorkbenchPartLabelProvider(),

-			WorkbenchMessages.getString("EditorManager.saveResourcesMessage")

-		);

-		dialog.setTitle(WorkbenchMessages.getString("EditorManager.saveResourcesTitle"));

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSaveAs() {

-		Dialog dialog = new SaveAsDialog( getShell() );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSavePerspective() {

-		PerspectiveRegistry reg = (PerspectiveRegistry)WorkbenchPlugin.getDefault().getPerspectiveRegistry();

-		// Get persp name.

-		SavePerspectiveDialog dialog = new SavePerspectiveDialog(getShell(), reg);

-		IPerspectiveDescriptor description = reg.findPerspectiveWithId( getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId() );

-		dialog.setInitialSelection(description);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSelectPerspective() {

-		Dialog dialog = new SelectPerspectiveDialog(getShell(), PlatformUI.getWorkbench().getPerspectiveRegistry() );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSelectTypes() {

-		Dialog dialog = new TypeFilteringDialog(getShell(), null);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testShowView() {

-		Dialog dialog = new ShowViewDialog( getShell(), WorkbenchPlugin.getDefault().getViewRegistry() );

-		DialogCheck.assertDialog(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testTaskFilters() {

-		Dialog dialog = TaskListTestStub.newFiltersDialog( getShell() );

-		DialogCheck.assertDialog(dialog, this);

-	}

- */

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java
deleted file mode 100644
index bc2d9a7..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import junit.framework.TestCase;

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

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

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

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

-import org.eclipse.ui.*;

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

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

-import org.eclipse.ui.internal.dialogs.*;

-import org.eclipse.ui.internal.model.AdaptableList;

-import org.eclipse.ui.internal.registry.*;

-import org.eclipse.jdt.junit.util.DialogCheck;

-import org.eclipse.ui.model.WorkbenchContentProvider;

-

-

-public class UIDialogsAuto extends TestCase {

-	private static final String PROJECT_SELECTION_MESSAGE = WorkbenchMessages.getString("BuildOrderPreference.selectOtherProjects");

-	private static final String FILTER_SELECTION_MESSAGE = ResourceNavigatorMessagesCopy.getString("FilterSelection.message");

-	

-	public UIDialogsAuto(String name) {

-		super(name);

-	}

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	private IWorkbench getWorkbench() {

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

-	}

-

-	public void testAbout() {

-		Dialog dialog = new AboutDialog( getShell() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testAddProjects() {

-		Dialog dialog = new ListSelectionDialog(getShell(),

-			null,

-			new SimpleListContentProvider(),

-			new LabelProvider(),

-			PROJECT_SELECTION_MESSAGE

-		);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testCopyMoveProject() {

-		IProject dummyProject = ResourcesPlugin.getWorkspace().getRoot().getProject("DummyProject");

-		Dialog dialog = new ProjectLocationSelectionDialog(getShell(), dummyProject);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testCopyMoveResource() {

-		Dialog dialog = new ContainerSelectionDialog( getShell(), null, true, WorkbenchMessages.getString("CopyResourceAction.selectDestination") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testEditActionSetsDialog() {

-		Dialog dialog;

-		Perspective persp = null;

-		//Test perspective: use current perspective of test case

-		try {/*fixme: should try to get current perspective, or default; currently only

-			 gets first perspective in the registry.*/

-			persp = new Perspective((PerspectiveDescriptor)getWorkbench().getPerspectiveRegistry().getPerspectives()[0],

-			                                    (WorkbenchPage)getWorkbench().getActiveWorkbenchWindow().getActivePage()

-			);

-			dialog = new ActionSetSelectionDialog(getShell(),  persp);

-		} catch (WorkbenchException e) {

-			dialog = null;

-		}

-		DialogCheck.assertDialogTexts(dialog, this);

-		if (persp != null) {

-			persp.dispose();

-		}

-	}

-	public void testEditorSelection() {

-		Dialog dialog = new EditorSelectionDialog( getShell() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testFindReplace() {

-		Dialog dialog = TextEditorTestStub.newFindReplaceDialog( getShell() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testGotoResource() {

-		Dialog dialog = NavigatorTestStub.newGotoResourceDialog(getShell(), new IResource[0]);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

- */

-	public void testNavigatorFilter() {

-		Dialog dialog = new ListSelectionDialog(getShell(), null, new SimpleListContentProvider(), new LabelProvider(), FILTER_SELECTION_MESSAGE);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNewFileType() {

-		Dialog dialog = new FileExtensionDialog( getShell() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testProgressInformation() {

-		ProgressMonitorDialog dialog = new ProgressMonitorDialog( getShell() );

-		dialog.setBlockOnOpen(true);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSaveAll() {

-		YesNoCancelListSelectionDialog dialog = new YesNoCancelListSelectionDialog(

-			getShell(),

-			new AdaptableList(),

-			new WorkbenchContentProvider(),

-			new WorkbenchPartLabelProvider(),

-			WorkbenchMessages.getString("EditorManager.saveResourcesMessage")

-		);

-		dialog.setTitle(WorkbenchMessages.getString("EditorManager.saveResourcesTitle"));

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSaveAs() {

-		Dialog dialog = new SaveAsDialog( getShell() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSavePerspective() {

-		PerspectiveRegistry reg = (PerspectiveRegistry)WorkbenchPlugin.getDefault().getPerspectiveRegistry();

-		// Get persp name.

-		SavePerspectiveDialog dialog = new SavePerspectiveDialog(getShell(), reg);

-		IPerspectiveDescriptor description = reg.findPerspectiveWithId( getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId() );

-		dialog.setInitialSelection(description);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSelectPerspective() {

-		Dialog dialog = new SelectPerspectiveDialog(getShell(), PlatformUI.getWorkbench().getPerspectiveRegistry() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSelectTypes() {

-		Dialog dialog = new TypeFilteringDialog(getShell(), null);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testShowView() {

-		Dialog dialog = new ShowViewDialog( getShell(), WorkbenchPlugin.getDefault().getViewRegistry() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testTaskFilters() {

-		Dialog dialog = TaskListTestStub.newFiltersDialog( getShell() );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

- */

-}

-

-

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java
deleted file mode 100644
index 4e3f656..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-

-import junit.framework.*;

-import junit.textui.TestRunner;

-

-

-/**

- * Test all areas of the UI.

- */

-public class UIInteractiveSuite extends TestSuite {

-

-	/**

-	 * Returns the suite.  This is required to

-	 * use the JUnit Launcher.

-	 */

-	public static Test suite() {

-		return new UIInteractiveSuite();

-	}

-	

-	/**

-	 * Construct the test suite.

-	 */

-	public UIInteractiveSuite() {

-		addTest(new TestSuite(UIPreferences.class));

-		addTest(new TestSuite(UIWizards.class));

-		addTest(new TestSuite(UIDialogs.class));

-		addTest(new TestSuite(UIMessageDialogs.class));

-	}

-

-

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
deleted file mode 100644
index 8a942e6..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
+++ /dev/null
@@ -1,405 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import java.util.ResourceBundle;

-

-import junit.framework.TestCase;

-import org.eclipse.jdt.junit.util.DialogCheck;

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

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

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

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

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

-import org.eclipse.ui.internal.WorkbenchMessages;

-

-public class UIMessageDialogs extends TestCase {

-	private static final String DUMMY_RESOURCE = "Dummy.resource";

-	private static final String DUMMY_PROJECT = "DummyProject";

-	private static final String DUMMY_ABSOLUTE_PATH = "C:\\Dummypath\\Dummy.resource";

-	private static final String DUMMY_RELATIVE_PATH = "\\" + DUMMY_PROJECT + "\\" + DUMMY_RESOURCE;

-	

-	public UIMessageDialogs(String name) {

-		super(name);

-	}

-	

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	

-	/**

-	 * Returns the given string from the Text Editor's resource bundle.

-	 * Should call org.eclipse.ui.texteditor.EditorMessages directly,

-	 * but it has package visibility.

-	 */

-	private String getEditorString(String id) {

-		ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ui.texteditor.EditorMessages");

-		assertNotNull("EditorMessages", bundle);

-		String string = bundle.getString(id);		

-		assertNotNull(id, string);

-		return string;

-	}

-	

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openConfirm.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return Dialog the confirm dialog.

-	 */

-	private MessageDialog getConfirmDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(), 

-			title, 

-			null,

-			message, 

-			MessageDialog.QUESTION, 

-			new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openError.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the error confirm dialog.

-	 */

-	private MessageDialog getErrorDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title, 

-			null,

-			message, 

-			MessageDialog.ERROR, 

-			new String[] {IDialogConstants.OK_LABEL}, 

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openInformation.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the information dialog.

-	 */

-	private MessageDialog getInformationDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title,

-			null,

-			message,

-			MessageDialog.INFORMATION,

-			new String[] { IDialogConstants.OK_LABEL },

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openQuestion.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the question dialog.

-	 */

-	private MessageDialog getQuestionDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title, 

-			null,

-			message, 

-			MessageDialog.QUESTION, 

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::getWarningDialog.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the confirm dialog.

-	 */

-	private MessageDialog getWarningDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title, 

-			null,

-			message, 

-			MessageDialog.WARNING, 

-			new String[] {IDialogConstants.OK_LABEL}, 

-			0);

-	}

-	

-	public void testAbortPageFlipping() {

-		Dialog dialog = getWarningDialog(

-			JFaceResources.getString("AbortPageFlippingDialog.title"),

-			JFaceResources.getString("AbortPageFlippingDialog.message") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testCloseFileDeleted() {

-		Dialog dialog = getConfirmDialog(

-				getEditorString("Editor.error.activated.deleted.close.title"),

-				getEditorString("Editor.error.activated.deleted.close.message") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testCopyOverwrite() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("CopyResourceAction.resourceExists"),

-			WorkbenchMessages.format("CopyResourceAction.overwriteQuestion", new Object[] {DUMMY_RELATIVE_PATH}) );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testDeleteProject() {

-		String title = WorkbenchMessages.getString("DeleteResourceAction.titleProject");

-		String msg = WorkbenchMessages.format("DeleteResourceAction.confirmProject1", new Object[] {DUMMY_PROJECT, DUMMY_ABSOLUTE_PATH});

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			title, 

-			null,	// accept the default window icon

-			msg, 

-			MessageDialog.QUESTION, 

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testDeleteReadOnlyCheck() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("DeleteResourceAction.checkDelete"),

-			null,

-			WorkbenchMessages.format("DeleteResourceAction.readOnlyQuestion", new Object[] {DUMMY_RESOURCE}),

-			MessageDialog.QUESTION,

-			new String[] {

-				IDialogConstants.YES_LABEL,

-				IDialogConstants.YES_TO_ALL_LABEL,

-				IDialogConstants.NO_LABEL,

-				IDialogConstants.CANCEL_LABEL },

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testDeleteResource() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("DeleteResourceAction.title"),

-			WorkbenchMessages.format("DeleteResourceAction.confirm1", new Object[] {DUMMY_RESOURCE}) );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testDeleteResources() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("DeleteResourceAction.title"),

-			WorkbenchMessages.format("DeleteResourceAction.confirmN", new Object[] {DUMMY_RESOURCE}) );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testDropOverwrite() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			ResourceNavigatorMessagesCopy.getString("DropAdapter.question"),

-			null,

-			ResourceNavigatorMessagesCopy.format("DropAdapter.overwriteQuery", new Object[] {DUMMY_RELATIVE_PATH}),

-			MessageDialog.QUESTION,

-			new String[] {

-				IDialogConstants.YES_LABEL,

-				IDialogConstants.NO_LABEL,

-				IDialogConstants.YES_TO_ALL_LABEL,

-				IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testErrorClosing() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("Error"),

-			WorkbenchMessages.getString("ErrorClosingNoArg") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testFileChanged() {

-		MessageDialog dialog = getQuestionDialog(

-				getEditorString("Editor.error.activated.outofsync.title"),

-				getEditorString("Editor.error.activated.outofsync.message") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testFileExtensionEmpty() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("FileEditorPreference.extensionEmptyTitle"),

-			WorkbenchMessages.getString("FileEditorPreference.extensionEmptyMessage") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testFileNameWrong() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("FileEditorPreference.fileNameInvalidTitle"),

-			WorkbenchMessages.getString("FileEditorPreference.fileNameInvalidMessage") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testFileTypeExists() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("FileEditorPreference.existsTitle"),

-			WorkbenchMessages.getString("FileEditorPreference.existsMessage") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testInvalidType_1() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("FileExtension.invalidTitle"),

-			WorkbenchMessages.getString("FileExtension.invalidMessage") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testInvalidType_2() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("FileExtension.invalidType"),

-			WorkbenchMessages.getString("FileExtension.invalidTypeMessage") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testMoveReadOnlyCheck() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("MoveResourceAction.title"),

-			null,

-			WorkbenchMessages.format("MoveResourceAction.checkMoveMessage", new Object[] {DUMMY_RESOURCE}),

-			MessageDialog.QUESTION,

-			new String[] {

-				IDialogConstants.YES_LABEL,

-				IDialogConstants.YES_TO_ALL_LABEL,

-				IDialogConstants.NO_LABEL,

-				IDialogConstants.CANCEL_LABEL },

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	/*

-	public void testNoBuilders() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("BuildAction.warning"),

-			WorkbenchMessages.getString("BuildAction.noBuilders") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	*/

-	/*

-	public void testNoGlobalBuildersDialog() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("GlobalBuildAction.warning"),

-			WorkbenchMessages.getString("GlobalBuildAction.noBuilders") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	*/

-	public void testNoPropertyPage() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("PropertyDialog.messageTitle"),

-			WorkbenchMessages.format("PropertyDialog.noPropertyMessage", new Object[] {"DummyPropertyPage"}) );	

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNoSelectedExportResources() {

-		Dialog dialog = getInformationDialog(

-			DataTransferMessagesCopy.getString("DataTransfer.information"),

-			DataTransferMessagesCopy.getString("FileExport.noneSelected") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNoSelectedImportResources() {

-		Dialog dialog = getInformationDialog(

-			DataTransferMessagesCopy.getString("DataTransfer.information"),

-			DataTransferMessagesCopy.getString("FileImport.noneSelected") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testOperationNotAvailable() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("Information"),

-			WorkbenchMessages.getString("PluginActino.operationNotAvailableMessage") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testOverwritePerspective() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("SavePerspective.overwriteTitle"),

-			null,

-			WorkbenchMessages.format("SavePerspective.overwriteQuestion", new Object[] {"Dummy Perspective"}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testRefreshDeleteProject() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("RefreshAction.dialogTitle"),

-			null,

-			WorkbenchMessages.format("RefreshAction.locationDeletedMessage", new Object[] {DUMMY_PROJECT, "c:\\dummypath\\" + DUMMY_PROJECT}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testRenameOverwrite() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("RenameResourceAction.resourceExists"),

-			WorkbenchMessages.format("RenameResourceAction.overwriteQuestion", new Object[] {DUMMY_RELATIVE_PATH}) );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testResetPerspective() {		

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("ResetPerspective.title"),

-			null,

-			WorkbenchMessages.format("ResetPerspective.message", new Object[] {"Dummy Perspective"}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSaveAsOverwrite() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("Question"),

-			null,

-			WorkbenchMessages.format("SaveAsDialog.overwriteQuestion", new Object[] {DUMMY_RELATIVE_PATH}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSaveChanges() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("Save_Resource"),

-			null,

-			WorkbenchMessages.format("EditorManager.saveChangesQuestion", new Object[] {DUMMY_RESOURCE}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testSaveFileDeleted() {

-		MessageDialog dialog = new MessageDialog(

-				getShell(),

-				getEditorString("Editor.error.activated.deleted.save.title"),

-				null,

-				getEditorString("Editor.error.activated.deleted.save.message"),

-				MessageDialog.QUESTION,

-				new String[] {

-					getEditorString("Editor.error.activated.deleted.save.button.save"),

-					getEditorString("Editor.error.activated.deleted.save.button.close")},

-				0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testUpdateConflict() {

-		MessageDialog dialog = getQuestionDialog(

-				getEditorString("Editor.error.save.outofsync.title"),

-				getEditorString("Editor.error.save.outofsync.message") );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testWizardClosing() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			JFaceResources.getString("WizardClosingDialog.title"),

-			null,

-			JFaceResources.getString("WizardClosingDialog.message"),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.OK_LABEL},

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testWizardOverwrite() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("Question"),

-			null, 

-			WorkbenchMessages.format("WizardDataTransfer.existsQuestion", new Object[] {DUMMY_ABSOLUTE_PATH}),

-			MessageDialog.QUESTION, 

-			new String[] {

-				IDialogConstants.YES_LABEL, 

-				IDialogConstants.NO_LABEL, 

-				IDialogConstants.YES_TO_ALL_LABEL, 

-				IDialogConstants.CANCEL_LABEL}, 

-			0);

-		DialogCheck.assertDialog(dialog, this);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
deleted file mode 100644
index bce1c4e..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import java.util.ResourceBundle;

-

-import junit.framework.TestCase;

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

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

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

-import org.eclipse.ui.internal.WorkbenchMessages;

-import org.eclipse.jdt.junit.util.DialogCheck;

-

-

-public class UIMessageDialogsAuto extends TestCase {

-	private static final String DUMMY_RESOURCE = "Dummy.resource";

-	private static final String DUMMY_PROJECT = "DummyProject";

-	private static final String DUMMY_ABSOLUTE_PATH = "C:\\Dummypath\\Dummy.resource";

-	private static final String DUMMY_RELATIVE_PATH = "\\" + DUMMY_PROJECT + "\\" + DUMMY_RESOURCE;

-	

-	public UIMessageDialogsAuto(String name) {

-		super(name);

-	}

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openConfirm.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return Dialog the confirm dialog.

-	 */

-	private MessageDialog getConfirmDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(), 

-			title, 

-			null,

-			message, 

-			MessageDialog.QUESTION, 

-			new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openError.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the error confirm dialog.

-	 */

-	private MessageDialog getErrorDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title, 

-			null,

-			message, 

-			MessageDialog.ERROR, 

-			new String[] {IDialogConstants.OK_LABEL}, 

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openInformation.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the information dialog.

-	 */

-	private MessageDialog getInformationDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title,

-			null,

-			message,

-			MessageDialog.INFORMATION,

-			new String[] { IDialogConstants.OK_LABEL },

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::openQuestion.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the question dialog.

-	 */

-	private MessageDialog getQuestionDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title, 

-			null,

-			message, 

-			MessageDialog.QUESTION, 

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 

-			0);

-	}

-	/*

-	 * Convenience method simliar to org.eclipse.jface.dialogs.MessageDialog::getWarningDialog.

-	 * The method will return the dialog instead of opening.

-	 * @param title the dialog's title, or <code>null</code> if none.

-	 * @param message the message.

-	 * @return MessageDialog the confirm dialog.

-	 */

-	private MessageDialog getWarningDialog(String title, String message) {

-		return new MessageDialog(

-			getShell(),

-			title, 

-			null,

-			message, 

-			MessageDialog.WARNING, 

-			new String[] {IDialogConstants.OK_LABEL}, 

-			0);

-	}

-	

-	public void testAbortPageFlipping() {

-		Dialog dialog = getWarningDialog (

-			JFaceResources.getString("AbortPageFlippingDialog.title"),

-			JFaceResources.getString("AbortPageFlippingDialog.message") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testCloseFileDeleted() {

-		Dialog dialog = null;

-		ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ui.texteditor.EditorMessages");

-		if (bundle != null) {

-			dialog = getConfirmDialog(

-				bundle.getString("Editor.error.activated.deleted.close.title"),

-				bundle.getString("Editor.error.activated.deleted.close.message") );

-		}

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testCopyOverwrite() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("CopyResourceAction.resourceExists"),

-			WorkbenchMessages.format("CopyResourceAction.overwriteQuestion", new Object[] {DUMMY_RELATIVE_PATH}) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testDeleteProject() {

-		String title = WorkbenchMessages.getString("DeleteResourceAction.titleProject");

-		String msg = WorkbenchMessages.format("DeleteResourceAction.confirmProject1", new Object[] {DUMMY_PROJECT, DUMMY_ABSOLUTE_PATH});

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			title, 

-			null,	// accept the default window icon

-			msg, 

-			MessageDialog.QUESTION, 

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testDeleteReadOnlyCheck() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("DeleteResourceAction.checkDelete"),

-			null,

-			WorkbenchMessages.format("DeleteResourceAction.readOnlyQuestion", new Object[] {DUMMY_RESOURCE}),

-			MessageDialog.QUESTION,

-			new String[] {

-				IDialogConstants.YES_LABEL,

-				IDialogConstants.YES_TO_ALL_LABEL,

-				IDialogConstants.NO_LABEL,

-				IDialogConstants.CANCEL_LABEL },

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testDeleteResource() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("DeleteResourceAction.title"),

-			WorkbenchMessages.format("DeleteResourceAction.confirm1", new Object[] {DUMMY_RESOURCE}) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testDeleteResources() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("DeleteResourceAction.title"),

-			WorkbenchMessages.format("DeleteResourceAction.confirmN", new Object[] {DUMMY_RESOURCE}) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testDropOverwrite() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			ResourceNavigatorMessagesCopy.getString("DropAdapter.question"),

-			null,

-			ResourceNavigatorMessagesCopy.format("DropAdapter.overwriteQuery", new Object[] {DUMMY_RELATIVE_PATH}),

-			MessageDialog.QUESTION,

-			new String[] {

-				IDialogConstants.YES_LABEL,

-				IDialogConstants.NO_LABEL,

-				IDialogConstants.YES_TO_ALL_LABEL,

-				IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testErrorClosing() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("Error"),

-			WorkbenchMessages.getString("ErrorClosingNoArg") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testFileChanged() {

-		MessageDialog dialog = null;

-		ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ui.texteditor.EditorMessages");

-		if (bundle != null) {

-			dialog = getQuestionDialog(

-				bundle.getString("Editor.error.activated.outofsync.title"),

-				bundle.getString("Editor.error.activated.outofsync.message") );

-		}

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testFileExtensionEmpty() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("FileEditorPreference.extensionEmptyTitle"),

-			WorkbenchMessages.getString("FileEditorPreference.extensionEmptyMessage") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testFileNameWrong() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("FileEditorPreference.fileNameInvalidTitle"),

-			WorkbenchMessages.getString("FileEditorPreference.fileNameInvalidMessage") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testFileTypeExists() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("FileEditorPreference.existsTitle"),

-			WorkbenchMessages.getString("FileEditorPreference.existsMessage") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testInvalidType_1() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("FileExtension.invalidTitle"),

-			WorkbenchMessages.getString("FileExtension.invalidMessage") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testInvalidType_2() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("FileExtension.invalidType"),

-			WorkbenchMessages.getString("FileExtension.invalidTypeMessage") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testMoveReadOnlyCheck() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("MoveResourceAction.title"),

-			null,

-			WorkbenchMessages.format("MoveResourceAction.checkMoveMessage", new Object[] {DUMMY_RESOURCE}),

-			MessageDialog.QUESTION,

-			new String[] {

-				IDialogConstants.YES_LABEL,

-				IDialogConstants.YES_TO_ALL_LABEL,

-				IDialogConstants.NO_LABEL,

-				IDialogConstants.CANCEL_LABEL },

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNoBuilders() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("BuildAction.warning"),

-			WorkbenchMessages.getString("BuildAction.noBuilders") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNoGlobalBuildersDialog() {

-		Dialog dialog = getWarningDialog(

-			WorkbenchMessages.getString("GlobalBuildAction.warning"),

-			WorkbenchMessages.getString("GlobalBuildAction.noBuilders") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNoPropertyPage() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("PropertyDialog.messageTitle"),

-			WorkbenchMessages.format("PropertyDialog.noPropertyMessage", new Object[] {"DummyPropertyPage"}) );	

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNoSelectedExportResources() {

-		Dialog dialog = getInformationDialog(

-			DataTransferMessagesCopy.getString("DataTransfer.information"),

-			DataTransferMessagesCopy.getString("FileExport.noneSelected") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNoSelectedImportResources() {

-		Dialog dialog = getInformationDialog(

-			DataTransferMessagesCopy.getString("DataTransfer.information"),

-			DataTransferMessagesCopy.getString("FileImport.noneSelected") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testOperationNotAvailable() {

-		Dialog dialog = getInformationDialog(

-			WorkbenchMessages.getString("Information"),

-			WorkbenchMessages.getString("PluginActino.operationNotAvailableMessage") );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testOverwritePerspective() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("SavePerspective.overwriteTitle"),

-			null,

-			WorkbenchMessages.format("SavePerspective.overwriteQuestion", new Object[] {"Dummy Perspective"}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testRefreshDeleteProject() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("RefreshAction.dialogTitle"),

-			null,

-			WorkbenchMessages.format("RefreshAction.locationDeletedMessage", new Object[] {DUMMY_PROJECT, "c:\\dummypath\\" + DUMMY_PROJECT}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testRenameOverwrite() {

-		Dialog dialog = getQuestionDialog(

-			WorkbenchMessages.getString("RenameResourceAction.resourceExists"),

-			WorkbenchMessages.format("RenameResourceAction.overwriteQuestion", new Object[] {DUMMY_RELATIVE_PATH}) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testResetPerspective() {		

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("ResetPerspective.title"),

-			null,

-			WorkbenchMessages.format("ResetPerspective.message", new Object[] {"Dummy Perspective"}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSaveAsOverwrite() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("Question"),

-			null,

-			WorkbenchMessages.format("SaveAsDialog.overwriteQuestion", new Object[] {DUMMY_RELATIVE_PATH}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSaveChanges() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("Save_Resource"),

-			null,

-			WorkbenchMessages.format("EditorManager.saveChangesQuestion", new Object[] {DUMMY_RESOURCE}),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testSaveFileDeleted() {

-		MessageDialog dialog = null;

-		ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ui.texteditor.EditorMessages");

-		if (bundle != null) {

-			dialog= new MessageDialog(

-				getShell(),

-				bundle.getString("Editor.error.activated.deleted.save.title"),

-				null,

-				bundle.getString("Editor.error.activated.deleted.save.message"),

-				MessageDialog.QUESTION,

-				new String[] {

-					bundle.getString("Editor.error.activated.deleted.save.button.save"),

-					bundle.getString("Editor.error.activated.deleted.save.button.close")},

-				0);

-		}

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testUpdateConflict() {

-		MessageDialog dialog = null;

-		ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ui.texteditor.EditorMessages");

-		if (bundle != null) {

-			dialog = getQuestionDialog(

-				bundle.getString("Editor.error.save.outofsync.title"),

-				bundle.getString("Editor.error.save.outofsync.message") );

-		}

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testWizardClosing() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			JFaceResources.getString("WizardClosingDialog.title"),

-			null,

-			JFaceResources.getString("WizardClosingDialog.message"),

-			MessageDialog.QUESTION,

-			new String[] {IDialogConstants.OK_LABEL},

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testWizardOverwrite() {

-		Dialog dialog = new MessageDialog(

-			getShell(),

-			WorkbenchMessages.getString("Question"),

-			null, 

-			WorkbenchMessages.format("WizardDataTransfer.existsQuestion", new Object[] {DUMMY_ABSOLUTE_PATH}),

-			MessageDialog.QUESTION, 

-			new String[] {

-				IDialogConstants.YES_LABEL, 

-				IDialogConstants.NO_LABEL, 

-				IDialogConstants.YES_TO_ALL_LABEL, 

-				IDialogConstants.CANCEL_LABEL}, 

-			0);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-

-

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferences.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferences.java
deleted file mode 100644
index 5609703..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferences.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import java.util.Iterator;

-

-import junit.framework.TestCase;

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

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

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

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

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

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

-import org.eclipse.ui.help.WorkbenchHelp;

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

-import org.eclipse.ui.internal.dialogs.*;

-import org.eclipse.jdt.junit.util.DialogCheck;

-import org.eclipse.ui.model.IWorkbenchAdapter;

-

-public class UIPreferences extends TestCase {

-	private IProject _project;

-	private static final String PROJECT_NAME = "DummyProject";

-	

-	public UIPreferences(String name) {

-		super(name);

-	}

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	private IProject getDummyProject() {

-		try {

-			IProject projects[] = WorkbenchPlugin.getPluginWorkspace().getRoot().getProjects();

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

-				if ( projects[i].getName().equals(PROJECT_NAME) ) {

-					projects[i].delete(true, null);

-					break;

-				}

-			}

-			_project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);

-			_project.create(null);

-		} catch (CoreException e) {

-			System.out.println(e);

-		}

-		return _project;

-	}

-	private void deleteDummyProject(){

-		try {

-			if (_project != null) {

-				_project.delete(true, null);

-			}

-		} catch (CoreException e) {

-			System.out.println(e);

-		}

-	}

-	private PreferenceDialog getPreferenceDialog(String id) {

-		PreferenceDialogWrapper dialog = null;

-		PreferenceManager manager = WorkbenchPlugin.getDefault().getPreferenceManager();

-		if (manager != null) {

-			dialog = new PreferenceDialogWrapper(getShell(), manager);

-			dialog.create();	

-			WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.PREFERENCE_DIALOG});

-

-			for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();

-			     iterator.hasNext();)

-			{

-				IPreferenceNode node = (IPreferenceNode)iterator.next();

-				if ( node.getId().equals(id) ) {

-					dialog.showPage(node);

-					break;

-				}

-			}

-		}

-		return dialog;

-	}

-	private PropertyDialog getPropertyDialog(String id) {

-		PropertyDialogWrapper dialog = null;

-

-		PropertyPageManager manager = new PropertyPageManager();

-		String title = "";

-		String name  = "";

-		

-		

-		IProject element = getDummyProject();

-		if (element ==  null) {			

-			return null;

-		}

-		// load pages for the selection

-		// fill the manager with contributions from the matching contributors

-		PropertyPageContributorManager.getManager().contribute(manager, element);

-		

-		IWorkbenchAdapter adapter = (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class);

-		if (adapter != null) {

-			name = adapter.getLabel(element);

-		}

-		

-		// testing if there are pages in the manager

-		Iterator pages = manager.getElements(PreferenceManager.PRE_ORDER).iterator();		

-		if (!pages.hasNext()) {

-			return null;

-		} else {

-			title = WorkbenchMessages.format("PropertyDialog.propertyMessage", new Object[] {name});

-			dialog = new PropertyDialogWrapper(getShell(), manager, new StructuredSelection(element)); 

-			dialog.create();

-			dialog.getShell().setText(title);

-			WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.PROPERTY_DIALOG});

-			for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();

-			     iterator.hasNext();)

-			{

-				IPreferenceNode node = (IPreferenceNode)iterator.next();

-				if ( node.getId().equals(id) ) {

-					dialog.showPage(node);

-					break;

-				}

-			}

-		}

-		return dialog;

-	}

-	

-	public void testWorkbenchPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Workbench");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testAppearancePref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Views");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testCompareViewersPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.compare.internal.ComparePreferencePage");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testDefaultTextEditorPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.TextEditor");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testFileEditorsPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileEditors");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testLocalHistoryPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileStates");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testPerspectivesPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Perspectives");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testInfoProp() {

-		Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.info.file");

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testProjectReferencesProp() {

-		Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.project.reference");

-		DialogCheck.assertDialog(dialog, this);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java
deleted file mode 100644
index 1fe0fa2..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import java.util.Iterator;

-

-import junit.framework.TestCase;

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

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

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

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

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

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

-import org.eclipse.ui.help.WorkbenchHelp;

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

-import org.eclipse.ui.internal.dialogs.*;

-import org.eclipse.jdt.junit.util.DialogCheck;

-import org.eclipse.ui.model.IWorkbenchAdapter;

-

-

-public class UIPreferencesAuto extends TestCase{

-

-	private IProject _project;

-	private static final String PROJECT_NAME = "DummyProject";

-	

-	public UIPreferencesAuto(String name) {

-		super(name);

-	}

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	

-	private IProject getDummyProject() {

-		try {

-			IProject projects[] = WorkbenchPlugin.getPluginWorkspace().getRoot().getProjects();

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

-				if ( projects[i].getName().equals(PROJECT_NAME) ) {

-					projects[i].delete(true, null);

-					break;

-				}

-			}

-			_project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);

-			_project.create(null);

-		} catch (CoreException e) {

-			System.out.println(e);

-		}

-		return _project;

-	}

-	private void deleteDummyProject(){

-		try {

-			if (_project != null) {

-				_project.delete(true, null);

-			}

-		} catch (CoreException e) {

-			System.out.println(e);

-		}

-	}

-	private PreferenceDialog getPreferenceDialog(String id) {

-		PreferenceDialogWrapper dialog = null;

-		PreferenceManager manager = WorkbenchPlugin.getDefault().getPreferenceManager();

-		if (manager != null) {

-			dialog = new PreferenceDialogWrapper(getShell(), manager);

-			dialog.create();	

-			WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.PREFERENCE_DIALOG});

-

-			for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();

-			     iterator.hasNext();)

-			{

-				IPreferenceNode node = (IPreferenceNode)iterator.next();

-				if ( node.getId().equals(id) ) {

-					dialog.showPage(node);

-					break;

-				}

-			}

-		}

-		return dialog;

-	}

-	private PropertyDialog getPropertyDialog(String id) {

-		PropertyDialogWrapper dialog = null;

-

-		PropertyPageManager manager = new PropertyPageManager();

-		String title = "";

-		String name  = "";

-		

-		

-		IProject element = getDummyProject();

-		if (element ==  null) {			

-			return null;

-		}

-		// load pages for the selection

-		// fill the manager with contributions from the matching contributors

-		PropertyPageContributorManager.getManager().contribute(manager, element);

-		

-		IWorkbenchAdapter adapter = (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class);

-		if (adapter != null) {

-			name = adapter.getLabel(element);

-		}

-		

-		// testing if there are pages in the manager

-		Iterator pages = manager.getElements(PreferenceManager.PRE_ORDER).iterator();		

-		if (!pages.hasNext()) {

-			return null;

-		} else {

-			title = WorkbenchMessages.format("PropertyDialog.propertyMessage", new Object[] {name});

-			dialog = new PropertyDialogWrapper(getShell(), manager, new StructuredSelection(element)); 

-			dialog.create();

-			dialog.getShell().setText(title);

-			WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.PROPERTY_DIALOG});

-			for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();

-			     iterator.hasNext();)

-			{

-				IPreferenceNode node = (IPreferenceNode)iterator.next();

-				if ( node.getId().equals(id) ) {

-					dialog.showPage(node);

-					break;

-				}

-			}

-		}

-		return dialog;

-	}

-	

-	public void testWorkbenchPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Workbench");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testAppearancePref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Views");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testCompareViewersPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.compare.internal.ComparePreferencePage");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testDefaultTextEditorPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.TextEditor");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testFileEditorsPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileEditors");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testLocalHistoryPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileStates");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testPerspectivesPref() {

-		Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Perspectives");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testInfoProp() {

-		Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.info.file");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testProjectReferencesProp() {

-		Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.project.reference");

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizards.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizards.java
deleted file mode 100644
index afba1f5..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizards.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import junit.framework.TestCase;

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

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

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

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

-import org.eclipse.ui.*;

-import org.eclipse.ui.dialogs.WizardNewProjectReferencePage;

-import org.eclipse.ui.help.WorkbenchHelp;

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

-import org.eclipse.ui.internal.dialogs.*;

-import org.eclipse.jdt.junit.util.DialogCheck;

-import org.eclipse.ui.wizards.newresource.*;

-

-

-public class UIWizards extends TestCase {

-	private static final int SIZING_WIZARD_WIDTH    = 470;

-	private static final int SIZING_WIZARD_HEIGHT   = 550;

-	private static final int SIZING_WIZARD_WIDTH_2  = 500;

-	private static final int SIZING_WIZARD_HEIGHT_2 = 500;

-	

-	public UIWizards(String name) {

-		super(name);

-	}

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	private IWorkbench getWorkbench() {

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

-	}

-	private WizardDialog exportWizard(IWizardPage page) {

-		ExportWizard wizard = new ExportWizard();

-		wizard.init(getWorkbench(), null);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("ExportResourcesAction");

-		if(wizardSettings == null)

-			wizardSettings = workbenchSettings.addNewSection("ExportResourcesAction");

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.EXPORT_WIZARD});

-

-		if (page != null) {

-			page.setWizard(wizard);

-			dialog.showPage(page);

-		}

-		return dialog;

-	}

-	private WizardDialog importWizard(IWizardPage page) {

-		ImportWizard wizard = new ImportWizard();

-		wizard.init(getWorkbench(), null);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("ImportResourcesAction");

-		if(wizardSettings==null)

-			wizardSettings = workbenchSettings.addNewSection("ImportResourcesAction");

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.IMPORT_WIZARD});

-		

-		if (page != null) {

-			page.setWizard(wizard);

-			dialog.showPage(page);

-		}

-		return dialog;

-	}

-

-	public void testExportResources() {//reference: ExportResourcesAction

-		Dialog dialog = exportWizard(null);

-		DialogCheck.assertDialog(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testFileSystemExport() {

-		Dialog dialog = exportWizard( DataTransferTestStub.newFileSystemResourceExportPage1(null) );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testZipFileExport() {

-		Dialog dialog = exportWizard( DataTransferTestStub.newZipFileResourceExportPage1(null) );

-		DialogCheck.assertDialog(dialog, this);

-	}

- */

-	public void testImportResources() {//reference: ImportResourcesAction

-		Dialog dialog = importWizard(null);

-		DialogCheck.assertDialog(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testFileSystemImport() {

-		Dialog dialog = importWizard( DataTransferTestStub.newFileSystemResourceImportPage1(WorkbenchPlugin.getDefault().getWorkbench(), StructuredSelection.EMPTY) );

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testZipFileImport() {

-		Dialog dialog = importWizard( DataTransferTestStub.newZipFileResourceImportPage1(null) );

-		DialogCheck.assertDialog(dialog, this);

-	}

- */

-	public void testNewFile() {

-		BasicNewFileResourceWizard wizard = new BasicNewFileResourceWizard();

-		wizard.init( PlatformUI.getWorkbench(), new StructuredSelection() );

-		wizard.setNeedsProgressMonitor(true);

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFileAction.title")); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_FILE_WIZARD});

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNewFolder() {

-		BasicNewFolderResourceWizard wizard = new BasicNewFolderResourceWizard();

-		wizard.init( PlatformUI.getWorkbench(), new StructuredSelection() );

-		wizard.setNeedsProgressMonitor(true);

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFolderAction.title")); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_FOLDER_WIZARD});

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNewProjectPage1() {

-		BasicNewProjectResourceWizard wizard = new BasicNewProjectResourceWizard();

-		wizard.init(PlatformUI.getWorkbench(), null);

-		wizard.setNeedsProgressMonitor(true);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFileAction.title")); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_PROJECT_WIZARD});

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNewProjectPage2() {

-		BasicNewProjectResourceWizard wizard = new BasicNewProjectResourceWizard();

-		wizard.init(PlatformUI.getWorkbench(), null);

-		wizard.setNeedsProgressMonitor(true);

-		

-		WizardNewProjectReferencePage page = new WizardNewProjectReferencePage("basicReferenceProjectPage");//$NON-NLS-1$

-		page.setTitle(ResourceMessagesCopy.getString("NewProject.refeerenceTitle")); //$NON-NLS-1$

-		page.setDescription(ResourceMessagesCopy.getString("NewProject.referenceDescription")); //$NON-NLS-1$				

-		page.setWizard(wizard);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFileAction.title")); //$NON-NLS-1$			

-		dialog.showPage(page);

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_PROJECT_WIZARD});

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNewProject() {

-		// Create wizard selection wizard.

-		NewWizard wizard = new NewWizard();

-		wizard.setProjectsOnly(true);

-		ISelection selection = getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		IStructuredSelection selectionToPass = null;

-		if (selection instanceof IStructuredSelection)

-			selectionToPass = (IStructuredSelection) selection;

-		else

-			selectionToPass = StructuredSelection.EMPTY;

-		wizard.init(getWorkbench(), selectionToPass);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("NewWizardAction");//$NON-NLS-1$

-		if(wizardSettings==null)

-			wizardSettings = workbenchSettings.addNewSection("NewWizardAction");//$NON-NLS-1$

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-	

-		// Create wizard dialog.

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_PROJECT_WIZARD});	

-		DialogCheck.assertDialog(dialog, this);

-	}

-	public void testNewResource() {

-		NewWizard wizard = new NewWizard();

-		ISelection selection = getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		IStructuredSelection selectionToPass = null;

-		if (selection instanceof IStructuredSelection)

-			selectionToPass = (IStructuredSelection) selection;

-		else

-			selectionToPass = StructuredSelection.EMPTY;

-		wizard.init(getWorkbench(), selectionToPass);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("NewWizardAction");//$NON-NLS-1$

-		if(wizardSettings==null)

-			wizardSettings = workbenchSettings.addNewSection("NewWizardAction");//$NON-NLS-1$

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_WIZARD});

-		DialogCheck.assertDialog(dialog, this);

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java
deleted file mode 100644
index 722b702..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.eclipse.ui.tests.dialogs;

-

-import junit.framework.TestCase;

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

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

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

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

-import org.eclipse.ui.*;

-import org.eclipse.ui.dialogs.WizardNewProjectReferencePage;

-import org.eclipse.ui.help.WorkbenchHelp;

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

-import org.eclipse.ui.internal.dialogs.*;

-import org.eclipse.jdt.junit.util.DialogCheck;

-import org.eclipse.ui.wizards.newresource.*;

-

-public class UIWizardsAuto extends TestCase {

-	private static final int SIZING_WIZARD_WIDTH    = 470;

-	private static final int SIZING_WIZARD_HEIGHT   = 550;

-	private static final int SIZING_WIZARD_WIDTH_2  = 500;

-	private static final int SIZING_WIZARD_HEIGHT_2 = 500;

-	

-	public UIWizardsAuto(String name) {

-		super(name);

-	}

-	private Shell getShell() {

-		return DialogCheck.getShell();

-	}

-	private IWorkbench getWorkbench() {

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

-	}

-	

-	private WizardDialog exportWizard(IWizardPage page) {

-		ExportWizard wizard = new ExportWizard();

-		wizard.init(getWorkbench(), null);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("ExportResourcesAction");

-		if(wizardSettings == null)

-			wizardSettings = workbenchSettings.addNewSection("ExportResourcesAction");

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.EXPORT_WIZARD});

-

-		if (page != null) {

-			page.setWizard(wizard);

-			dialog.showPage(page);

-		}

-		return dialog;

-	}

-	private WizardDialog importWizard(IWizardPage page) {

-		ImportWizard wizard = new ImportWizard();

-		wizard.init(getWorkbench(), null);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("ImportResourcesAction");

-		if(wizardSettings==null)

-			wizardSettings = workbenchSettings.addNewSection("ImportResourcesAction");

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.IMPORT_WIZARD});

-		

-		if (page != null) {

-			page.setWizard(wizard);

-			dialog.showPage(page);

-		}

-		return dialog;

-	}

-

-	public void testExportResources() {//reference: ExportResourcesAction

-		Dialog dialog = exportWizard(null);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testFileSystemExport() {

-		Dialog dialog = exportWizard( DataTransferTestStub.newFileSystemResourceExportPage1(null) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testZipFileExport() {

-		Dialog dialog = exportWizard( DataTransferTestStub.newZipFileResourceExportPage1(null) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

- */

-	public void testImportResources() {//reference: ImportResourcesAction

-		Dialog dialog = importWizard(null);

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-/**

- * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public packages.

- * 

-	public void testFileSystemImport() {

-		Dialog dialog = importWizard( DataTransferTestStub.newFileSystemResourceImportPage1(WorkbenchPlugin.getDefault().getWorkbench(), StructuredSelection.EMPTY) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testZipFileImport() {

-		Dialog dialog = importWizard( DataTransferTestStub.newZipFileResourceImportPage1(null) );

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

- */

-	public void testNewFile() {

-		BasicNewFileResourceWizard wizard = new BasicNewFileResourceWizard();

-		wizard.init( PlatformUI.getWorkbench(), new StructuredSelection() );

-		wizard.setNeedsProgressMonitor(true);

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFileAction.title")); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_FILE_WIZARD});

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNewFolder() {

-		BasicNewFolderResourceWizard wizard = new BasicNewFolderResourceWizard();

-		wizard.init( PlatformUI.getWorkbench(), new StructuredSelection() );

-		wizard.setNeedsProgressMonitor(true);

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFolderAction.title")); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_FOLDER_WIZARD});

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNewProjectPage1() {

-		BasicNewProjectResourceWizard wizard = new BasicNewProjectResourceWizard();

-		wizard.init(PlatformUI.getWorkbench(), null);

-		wizard.setNeedsProgressMonitor(true);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFileAction.title")); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_PROJECT_WIZARD});

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNewProjectPage2() {

-		BasicNewProjectResourceWizard wizard = new BasicNewProjectResourceWizard();

-		wizard.init(PlatformUI.getWorkbench(), null);

-		wizard.setNeedsProgressMonitor(true);

-		

-		WizardNewProjectReferencePage page = new WizardNewProjectReferencePage("basicReferenceProjectPage");//$NON-NLS-1$

-		page.setTitle(ResourceMessagesCopy.getString("NewProject.refeerenceTitle")); //$NON-NLS-1$

-		page.setDescription(ResourceMessagesCopy.getString("NewProject.referenceDescription")); //$NON-NLS-1$				

-		page.setWizard(wizard);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		dialog.getShell().setText(WorkbenchMessages.getString("CreateFileAction.title")); //$NON-NLS-1$			

-		dialog.showPage(page);

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_PROJECT_WIZARD});

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNewProject() {

-		// Create wizard selection wizard.

-		NewWizard wizard = new NewWizard();

-		wizard.setProjectsOnly(true);

-		ISelection selection = getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		IStructuredSelection selectionToPass = null;

-		if (selection instanceof IStructuredSelection)

-			selectionToPass = (IStructuredSelection) selection;

-		else

-			selectionToPass = StructuredSelection.EMPTY;

-		wizard.init(getWorkbench(), selectionToPass);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("NewWizardAction");//$NON-NLS-1$

-		if(wizardSettings==null)

-			wizardSettings = workbenchSettings.addNewSection("NewWizardAction");//$NON-NLS-1$

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-	

-		// Create wizard dialog.

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_PROJECT_WIZARD});	

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-	public void testNewResource() {

-		NewWizard wizard = new NewWizard();

-		ISelection selection = getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		IStructuredSelection selectionToPass = null;

-		if (selection instanceof IStructuredSelection)

-			selectionToPass = (IStructuredSelection) selection;

-		else

-			selectionToPass = StructuredSelection.EMPTY;

-		wizard.init(getWorkbench(), selectionToPass);

-		IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();

-		IDialogSettings wizardSettings = workbenchSettings.getSection("NewWizardAction");//$NON-NLS-1$

-		if(wizardSettings==null)

-			wizardSettings = workbenchSettings.addNewSection("NewWizardAction");//$NON-NLS-1$

-		wizard.setDialogSettings(wizardSettings);

-		wizard.setForcePreviousAndNextButtons(true);

-		

-		WizardDialog dialog = new WizardDialog(getShell(), wizard);

-		dialog.create();

-		dialog.getShell().setSize( Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT_2 );

-		WorkbenchHelp.setHelp(dialog.getShell(), new Object[]{IHelpContextIds.NEW_WIZARD});

-		DialogCheck.assertDialogTexts(dialog, this);

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java
deleted file mode 100644
index 02e2b74..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.ui.tests.internal;

-

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

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

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

-import org.eclipse.ui.*;

-import org.eclipse.ui.internal.WorkbenchWindow;

-import org.eclipse.jdt.junit.util.*;

-import org.eclipse.ui.tests.api.*;

-

-

-/**

- * This class contains tests for the editor action bars

- * implementation.

- */

-public class EditorActionBarsTest extends UITestCase {

-

-	protected IWorkbenchWindow fWindow;

-	protected IWorkbenchPage fPage;

-	private String EDITOR_ID = "org.eclipse.ui.tests.internal.EditorActionBarsTest";

-	

-	/**

-	 * Constructor for IEditorPartTest

-	 */

-	public EditorActionBarsTest(String testName) {

-		super(testName);

-	}

-

-	public void setUp() {

-		fWindow = openTestWindow();

-		fPage = fWindow.getActivePage();

-	}

-	

-	/**

-	 * Test action enablement / disablement when a

-	 * part is active.

-	 * <p>

-	 * Created for PR 1GJNB52: ToolItems in EditorToolBarManager can get 

-	 * out of synch with the state of the IAction

-	 * </p>

-	 */

-	public void testActionEnablementWhenActive() throws Throwable {

-		// Open an editor.

-		MockEditorPart editor = openEditor(fPage, "1");

-		MockEditorActionBarContributor contributor = 

-			(MockEditorActionBarContributor)editor.getEditorSite().getActionBarContributor();

-		

-		// Enable all actions.

-		contributor.enableActions(true);

-		verifyToolItemState(contributor, true);

-		

-		// Disable all actions.

-		contributor.enableActions(false);

-		verifyToolItemState(contributor, false);

-	}

-	

-	/**

-	 * Test action enablement / disablement when a

-	 * part is inactive.

-	 * <p>

-	 * Created for PR 1GJNB52: ToolItems in EditorToolBarManager can get 

-	 * out of synch with the state of the IAction

-	 * </p>

-	 */

-	public void testActionEnablementWhenInactive() throws Throwable {

-		// Open an editor.

-		MockEditorPart editor = openEditor(fPage, "2");

-		MockEditorActionBarContributor contributor = 

-			(MockEditorActionBarContributor)editor.getEditorSite().getActionBarContributor();

-		

-		// Enable all actions.

-		contributor.enableActions(true);

-		verifyToolItemState(contributor, true);

-		

-		// Activate some other part.  Disable the actions.

-		// Then activate the editor and test tool item state.

-		fPage.showView(MockViewPart.ID);

-		contributor.enableActions(false);

-		fPage.activate(editor);

-		verifyToolItemState(contributor, false);

-		

-		// Activate some other part.  Enable the actions.

-		// Then activate the editor and test tool item state.

-		fPage.showView(MockViewPart.ID);

-		contributor.enableActions(true);

-		fPage.activate(editor);

-		verifyToolItemState(contributor, true);

-	}

-	

-	/**

-	 * Open a test editor.

-	 */

-	protected MockEditorPart openEditor(IWorkbenchPage page, String suffix) 

-		throws Throwable 

-	{

-		IProject proj = FileUtil.createProject("IEditorActionBarsTest");

-		IFile file = FileUtil.createFile("test" + suffix + ".txt", proj);

-		return (MockEditorPart)page.openEditor(file, EDITOR_ID);

-	}

-	

-	/**

-	 * Tests whether actions are enabled.

-	 */

-	protected void verifyToolItemState(MockEditorActionBarContributor ctr,

-		boolean enabled) 

-	{

-		MockAction [] actions = ctr.getActions();

-		for (int nX = 0; nX < actions.length; nX ++)

-			verifyToolItemState(actions[nX], enabled);

-	}

-	

-	/**

-	 * Tests whether an action is enabled.

-	 */

-	protected void verifyToolItemState(IAction action, boolean enabled) {

-		String actionText = action.getText();

-		ToolBarManager tbm = ((WorkbenchWindow)fWindow).getToolBarManager();

-		ToolBar tb = tbm.getControl();

-		ToolItem [] items = tb.getItems();

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

-			String itemText = items[nX].getToolTipText();

-			if (actionText.equals(itemText)) {

-				assertEquals(enabled, items[nX].getEnabled());

-				return;

-			}

-		}

-		fail("Action for " + actionText + " not found");

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java
deleted file mode 100644
index cf25ee8..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.ui.tests.internal;

-

-import junit.framework.*;

-

-/**

- * Test all areas of the UI Implementation.

- */

-public class InternalTestSuite extends TestSuite {

-

-	/**

-	 * Returns the suite.  This is required to

-	 * use the JUnit Launcher.

-	 */

-	public static Test suite() {

-		return new InternalTestSuite();

-	}

-	

-	/**

-	 * Construct the test suite.

-	 */

-	public InternalTestSuite() {

-		addTest(new TestSuite(EditorActionBarsTest.class));

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTest.java
deleted file mode 100644
index c404620..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.eclipse.ui.tests.navigator;

-

-import java.io.ByteArrayInputStream;

-import java.io.StringBufferInputStream;

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

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

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

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.UITestCase;

-import org.eclipse.ui.views.navigator.ResourceNavigator;

-

-/**

- * Tests the Resource Navigator view.

- */

-public class NavigatorTest extends UITestCase {

-

-	private static final String NAVIGATOR_VIEW_ID = "org.eclipse.ui.views.ResourceNavigator";

-	

-	private IProject testProject;

-	private IFolder testFolder;

-	private IFile testFile;

-	private ResourceNavigator navigator;

-	

-	public NavigatorTest(String testName) {

-		super(testName);

-	}

-

-	private void createTestProject() throws CoreException {

-		if (testProject == null) {

-			IWorkspace workspace = ResourcesPlugin.getWorkspace();

-			testProject = workspace.getRoot().getProject("TestProject");

-			testProject.create(null);

-			testProject.open(null);

-		}

-	}

-	

-	private void createTestFolder() throws CoreException {

-		if (testFolder == null) {

-			createTestProject();

-			testFolder = testProject.getFolder("TestFolder");

-			testFolder.create(false, false, null);

-		}

-	}

-

-	private void createTestFile() throws CoreException {

-		if (testFile == null) {

-			createTestFolder();

-			testFile = testFolder.getFile("Foo.txt");

-			testFile.create(new ByteArrayInputStream("Some content.".getBytes()), false, null);

-		}

-	}

-

-	/** Shows the Navigator in a new test window. */

-	private void showNav() throws PartInitException {

-		IWorkbenchWindow window = openTestWindow();

-		navigator = (ResourceNavigator) window.getActivePage().showView(NAVIGATOR_VIEW_ID);

-	}

-	

-	public void tearDown() throws Exception {

-		if (testProject != null) {

-			try {

-				testProject.delete(true, null);

-			}

-			catch (CoreException e) {

-				fail(e.toString());

-			}

-			testProject = null;

-			testFolder = null;

-			testFile = null;

-		}

-		super.tearDown();

-		navigator = null;

-	}

-	

-	/**

-	 * Tests that the Navigator is initially populated with

-	 * the correct elements from the workspace.

-	 */

-	public void testInitialPopulation() throws CoreException, PartInitException {

-		createTestFile();

-		showNav();

-

-		// test its initial content by setting and getting selection on the file

-		ISelectionProvider selProv = navigator.getSite().getSelectionProvider();

-		StructuredSelection sel = new StructuredSelection(testFile);

-		selProv.setSelection(sel);

-		assertEquals(sel, selProv.getSelection());

-	}

-

-	/**

-	 * Tests that the Navigator updates properly when a file is added to the workbench.

-	 */

-	public void testFileAddition() throws CoreException, PartInitException {

-		createTestFolder(); // create the project and folder before the Navigator is shown

-		showNav();

-		createTestFile();  // create the file after the Navigator is shown

-		

-		// test its initial content by setting and getting selection on the file

-		ISelectionProvider selProv = navigator.getSite().getSelectionProvider();

-		StructuredSelection sel = new StructuredSelection(testFile);

-		selProv.setSelection(sel);

-		assertEquals(sel, selProv.getSelection());

-	}

-

-}

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java
deleted file mode 100644
index 056dac3..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.ui.tests.navigator;

-

-import junit.framework.*;

-

-

-public class NavigatorTestSuite extends TestSuite {

-

-	/**

-	 * Returns the suite.  This is required to

-	 * use the JUnit Launcher.

-	 */

-	public static Test suite() {

-		return new NavigatorTestSuite();

-	}

-	

-	/**

-	 * Construct the test suite.

-	 */

-	public NavigatorTestSuite() {

-		addTest(new TestSuite(ResourceNavigatorTest.class));

-	}

-

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/ResourceNavigatorTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/ResourceNavigatorTest.java
deleted file mode 100644
index 6b3b72f..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/ResourceNavigatorTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.eclipse.ui.tests.navigator;

-

-import java.lang.reflect.Method;

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

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

-import org.eclipse.ui.*;

-import org.eclipse.jdt.junit.util.*;

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

-import org.eclipse.ui.views.navigator.ResourceNavigator;

-

-public class ResourceNavigatorTest extends UITestCase {

-	private IWorkbenchPage activePage;

-	private IWorkbenchWindow workbenchWindow;

-	private IViewPart view;

-	private IProject p1;

-	private IProject p2;

-	private IFile f1;

-	private IFile f2;

-

-	/**

-	 * Constructor for ResourceNavigatorTest.

-	 * @param testName

-	 */

-	public ResourceNavigatorTest(String testName) {

-		super(testName);

-	}

-

-	private TreeViewer getViewer(ResourceNavigator view) throws Throwable {

-		Class clazz = view.getClass();

-		Method method = clazz.getDeclaredMethod("getResourceViewer", new Class [0]);

-		method.setAccessible(true);

-		return (TreeViewer) method.invoke(view, new Object[0]);

-	}

-	

-	public void setUp() {

-		workbenchWindow = openTestWindow();

-		activePage = workbenchWindow.getActivePage();

-	}

-

-	private void setupView() throws Throwable {

-		view = activePage.showView("org.eclipse.ui.views.ResourceNavigator");

-	}

-	

-	private void setupResources() throws Throwable {

-		if (p1 == null) {

-			p1 = FileUtil.createProject("TP1");

-			f1 = null;

-		}

-		if (p2 == null) {

-			p2 = FileUtil.createProject("TP2");

-			f2 = null;

-		}

-		if (f1 == null)

-			f1 = FileUtil.createFile("f1.txt", p1);

-		if (f2 == null)

-			f2 = FileUtil.createFile("f2.txt", p2);

-	}

-

-	public void testGlobalBookmarkAction() throws Throwable {

-		setupView();

-		setupResources();

-

-		// Select a file

-		IStructuredSelection sel = new StructuredSelection(f1);

-		((ResourceNavigator) view).selectReveal(sel);

-		

-		// Remember the previous marker count on the file

-		int oldCount = (f1.findMarkers(IMarker.BOOKMARK, true, IResource.DEPTH_INFINITE)).length;

-		

-		// Now try the bookmark action

-		ActionUtil.runActionUsingPath(this, workbenchWindow, IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.BOOKMARK);

-		

-		// Make sure the resource was bookmarked

-		int newCount = (f1.findMarkers(IMarker.BOOKMARK, true, IResource.DEPTH_INFINITE)).length;

-		assertTrue("Selected file was not bookmarked via Edit->Bookmark action.", oldCount + 1 == newCount);

-	}

-

-/*	

- * This test should be moved to an interactive test suite as this

- * test causes a dialog to popup when the resource is deleted by

- * the delete action

- * 

-	public void testGlobalDeleteAction() throws Throwable {

-		setupView();

-		setupResources();

-

-		// Select a file

-		IStructuredSelection sel = new StructuredSelection(f1);

-		((ResourceNavigator) view).selectReveal(sel);

-		

-		// Now try the delete action

-		ActionUtil.runActionUsingPath(this, workbenchWindow, IWorkbenchActionConstants.M_EDIT + '/' + IWorkbenchActionConstants.DELETE);

-		

-		// Make sure the resource was deleted

-		assertTrue("Selected file was not deleted via Edit->Delete action.", p1.findMember(f1.getName()) == null);

-		f1 = null;

-	}

-*/

-	

-	public void testSelectReveal() throws Throwable {

-		setupView();

-		setupResources();

-			

-		ISetSelectionTarget part = (ISetSelectionTarget) view;

-		TreeViewer tree = getViewer((ResourceNavigator)view);

-

-		// Set the selection in the navigator

-		IStructuredSelection sel1 = new StructuredSelection(f1);

-		part.selectReveal(sel1);

-		// Get the selection the tree has

-		IStructuredSelection treeSel1 = (IStructuredSelection) tree.getSelection();

-		assertTrue("First selection wrong size, should be only one.", treeSel1.size() == 1);

-		IResource resource1 = (IResource) treeSel1.getFirstElement();

-		assertTrue("First selection contains wrong file resource.", resource1.equals(f1));

-		

-		// Set the selection in the navigator

-		IStructuredSelection sel2 = new StructuredSelection(p2);

-		part.selectReveal(sel2);

-		// Get the selection the tree has

-		IStructuredSelection treeSel2 = (IStructuredSelection) tree.getSelection();

-		assertTrue("Second selection wrong size, should be only one.", treeSel2.size() == 1);

-		IResource resource2 = (IResource) treeSel2.getFirstElement();

-		assertTrue("Second selection contains wrong project resource.", resource2.equals(p2));

-	}

-}

-

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java
deleted file mode 100644
index 20fce60..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java
deleted file mode 100644
index ecc8b74..0000000
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.ui.tests.propertysheet;

-

-import junit.framework.*;

-import junit.textui.TestRunner;

-import org.eclipse.swt.SWT;

-

-/**

- * Test areas of the Property Sheet API.

- */

-public class PropertySheetTestSuite extends TestSuite {

-

-	/**

-	 * Returns the suite.  This is required to

-	 * use the JUnit Launcher.

-	 */

-	public static Test suite() {

-		return new PropertySheetTestSuite();

-	}

-	

-	/**

-	 * Construct the test suite.

-	 */

-	public PropertySheetTestSuite() {

-		addTest(new TestSuite(PropertySheetAuto.class));

-	}

-}
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/about.html b/tests/org.eclipse.ui.tests/about.html
deleted file mode 100644
index 9a15e5c..0000000
--- a/tests/org.eclipse.ui.tests/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body>

-<body lang=EN-US link=blue vlink=purple>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">About This Plug-in</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>1st November, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org makes available all content in this plug-in.  The plug-in is provided to you under the terms and conditions of the

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a>.  For purposes of the Common Public License, &quot;Program&quot; will mean the plug-in.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.ui.tests/build.properties b/tests/org.eclipse.ui.tests/build.properties
deleted file mode 100644
index ff29ba6..0000000
--- a/tests/org.eclipse.ui.tests/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.uitests.jar=Eclipse JFace Tests/,Eclipse UI Tests/

-

-bin.includes = icons/,\

-                 doc/,\

-                 plugin.properties,\

-                 plugin.xml,\

-			     *.html,\

-			     *.jar,\

-			     .options,\

-			     *.xml,\

-			     uiSniff,\

-			     uiSniff.bat

diff --git a/tests/org.eclipse.ui.tests/doc/Introduction.html b/tests/org.eclipse.ui.tests/doc/Introduction.html
deleted file mode 100644
index f85852b..0000000
--- a/tests/org.eclipse.ui.tests/doc/Introduction.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-   <meta name="Author" content="Build">

-   <meta name="GENERATOR" content="Mozilla/4.5 [en] (WinNT; I) [Netscape]">

-   <title>The Workbench Test Framework</title>

-</head>

-<body>

-

-<h2>

-The Workbench Test Suite</h2>

-Dave Springgay

-<br>September 2001

-<h3>

-In Brief</h3>

-This document describes the UI Test Suite.&nbsp; This test suite is available

-from <tt>org.eclipse.ui.tests</tt> in the desktop repository and consist

-of a series of non-interactive sniff tests which are run after a build,

-plus a set of interactive tests which require human feedback.&nbsp; You

-can run any of these from the JUnit Eclipse Plugin Tests launcher or from

-the command line.

-<p>The <tt>org.eclipse.ui.tests</tt> project is organized in hierarchical

-fashion.&nbsp; The root is <tt>UiTestSuite</tt> in <tt>org.eclipse.ui.tests</tt>.&nbsp;

-This test suite contains a collection of "specialized suites" which test

-specific areas of functionality or components in the workbench.&nbsp; Currently

-there is only one suite, <tt>ApiTestSuite

-</tt>in<tt> org.eclipse.ui.tests.api</tt>,

-which contains a number of test cases which deal specifically with workbench

-API.&nbsp; A <tt>uiTest</tt> extension is declared for each suite so that

-you can run every test in the workbench or a subset of the tests.

-<p>To run the UiTestSuite from within Eclipse just select UiTestSuite.java

-in the navigator and invoke Run > JUnit Eclipse Plugin Tests.&nbsp; The

-results of the test suite will appear in the JUnit view.

-<h3>

-Automated Sniff Tests</h3>

-The following process is used to run the workbench UI sniff tests after

-a build.

-<p>To create the sniff test files ..

-<ol>

-<li>

-Export the 4 test projects into a zip file.&nbsp; The options in the export

-wizard should be set to "Compress the contents of the file" and not "Create

-directory Structure".</li>

-</ol>

-To run the sniff tests in a fresh build of Eclipse ..

-<ol>

-<li>

-Unzip the zip file in the Eclipse plugins directory.</li>

-

-<li>

-On Windows copy uiSniff.bat in the org.eclipse.ui.tests plugin directory

-to the Eclipse home directory.&nbsp; On Linux copy uiSniff instead.</li>

-

-<li>

-Run uiSniff.bat ( or uiSniff ).&nbsp; Redirect the results into a file.</li>

-</ol>

-

-<h3>

-Test Patterns</h3>

-In our own testing we have discovered a number of common test patterns.&nbsp;

-In order to encourage a consistent approach for testing they are published

-below.

-<p><b>Simple Setters, Getters and Commands</b>

-<p>Scenario: You want to test setters, commands and getters on an interface.

-<p>Method: Call the setter or command which affects the object state.&nbsp;

-Call the getter to verify that state.

-<p><b>Top Down Coverage</b>

-<p>Scenario: You want to demonstrate thorough coverage of a component.

-<p>Method: Start at the object root of the instance hierarchy and test

-every class downwards to the leaf classes.&nbsp; Stop when you encounter

-a layer which already has JUnit test cases.&nbsp; For instance, in the

-workbench UI don't test JFace, SWT, or core.&nbsp; They should have their

-own test suites and are assumed to work.

-<p><b>Superclass Subclass</b>

-<p>Scenario: You want to test D, which is a subclass of B.

-<p>Method: Implement a test case for B called BTest.&nbsp; Then create

-a subclass of BTest called DTest which tests D.&nbsp; If B is an abstract

-class use a factory method in BTest to create the test object.

-<p><b>Listener Source</b>

-<p>Scenario: You want to test S, a class which fires events when a particular

-situation occurs.

-<p>Method: Implement a listener for S which records the reception of events.

-Then write a test class for S called STest which does something which should

-cause those events to fire.&nbsp; Verify the reception of events afterwards.

-<p><b>Multiple Session</b>

-<p>Scenario: You want to test the persistance of state from one session

-to the next.

-<p>Method: You need to create two test suites.&nbsp; One test suite will

-set up the state.&nbsp; The other will verify the state.&nbsp; Run them

-sequentially in two separate processes.

-<p><b>Global State</b>

-<p>Scenario: In Eclipse the workbench is a global object.&nbsp; Unfortunately,

-this means that one test case may modify that state and affect the outcome

-of another unrelated test case.&nbsp; How can you avoid this problem?

-<p>Method: If the test case modifies the state of a window or something

-in the window you should create a new window as part of the setUp for the

-test case.&nbsp; Run the test code within that window and then close the

-test window in the tearDown method.&nbsp; The modified state will be discarded

-when the window is closed

-<p><b>Lifecycle</b>

-<p>Scenario: Within the workbench there are various interfaces, such as

-IViewPart, which are defined as API and implemented by plugin code.&nbsp;

-There is no need to test the implementation of the interface, but it is

-good to test the lifecycle as implemented by objects which call the interface.

-<p>Method: Define a class X which implements the interface and records

-the invocation of various methods.&nbsp; Create a scenario where this class

-is loaded and should receive events.&nbsp; Afterwards, test that those

-methods were called.

-<p><b>Piercing the Encapsulation</b>

-<p>Scenario: To test the behavior of commands which modify the state of

-the object when there are no public interfaces to query that state.

-<p>Method: If possible, cast the interface to a concrete class with additional

-public methods.&nbsp; For instance, in the workbench the underlying structure

-for IWorkbench is exposed in Workbench.&nbsp; Given a Workbench object,

-you can get the menu, toolbar, etc, and interact directly with the actions

-to verify their state or invoke them directly.&nbsp; This is also a useful

-way to simulate action invocation from the UI.

-<p><b>Mock Objects</b>

-<p>Scenario: To test the implementation of an interface which instantiates

-an extension.&nbsp; For instance, in the test case for IWorkbenchPage we

-need to open views and editors.

-<p>Method: If we reference views and editors which exist within the Workbench

-UI Standard Components project the test case is vulnerable to change in

-those components.&nbsp; In this case we're not testing the components,

-we're testing IWorkbenchPage, so we implemented some light weight mock

-views and editors which do nothing more than record their own creation

-and lifecycle.

-<br>&nbsp;

-<br>&nbsp;

-<br>&nbsp;

-</body>

-</html>

diff --git a/tests/org.eclipse.ui.tests/icons/anything.gif b/tests/org.eclipse.ui.tests/icons/anything.gif
deleted file mode 100644
index efc77a7..0000000
--- a/tests/org.eclipse.ui.tests/icons/anything.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/icons/mockeditorpart1.gif b/tests/org.eclipse.ui.tests/icons/mockeditorpart1.gif
deleted file mode 100644
index efc77a7..0000000
--- a/tests/org.eclipse.ui.tests/icons/mockeditorpart1.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/icons/mockeditorpart2.gif b/tests/org.eclipse.ui.tests/icons/mockeditorpart2.gif
deleted file mode 100644
index efc77a7..0000000
--- a/tests/org.eclipse.ui.tests/icons/mockeditorpart2.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.ui.tests/plugin.xml b/tests/org.eclipse.ui.tests/plugin.xml
deleted file mode 100644
index 93cb6b9..0000000
--- a/tests/org.eclipse.ui.tests/plugin.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- File written by PDE 1.0 -->

-<plugin

-   id="org.eclipse.ui.tests"

-   name="Eclipse UI Tests"

-   version="1.0.0"

-   provider-name="Object Technology International"

-   class="org.eclipse.ui.tests.TestPlugin">

-<requires>

-   <import plugin="org.eclipse.core.boot"/>

-   <import plugin="org.eclipse.core.runtime"/>

-   <import plugin="org.eclipse.core.resources"/>

-   <import plugin="org.eclipse.swt"/>

-   <import plugin="org.eclipse.ui"/>

-   <import plugin="org.junit"/>

-   <import plugin="org.eclipse.jdt.junit"/>

-   <import plugin="org.eclipse.jdt.junit.eclipse"/>

-</requires>

-

-<runtime>

-   <library name="uitests.jar"/>

-</runtime>

-

-<extension 

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

-	<perspective

-		id="org.eclipse.ui.tests.api.SessionPerspective"

-		name="Session Perspective"

-		class="org.eclipse.ui.tests.api.SessionPerspective">

-	</perspective>

-</extension>

-

-<extension 

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

-	<view

-       id="org.eclipse.ui.tests.api.MockViewPart"

-	   name="Mock View 1"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.api.MockViewPart"/>

-	<view

-       id="org.eclipse.ui.tests.api.MockViewPart2"

-	   name="Mock View 2"

-      icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.api.MockViewPart"/>

-	<view

-       id="org.eclipse.ui.tests.api.MockViewPart3"

-	   name="Mock View 3"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.api.MockViewPart"/>

-	<view

-       id="org.eclipse.ui.tests.api.SessionView"

-	   name="Session Test View"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.api.SessionView"/>

-	<view

-       id="org.eclipse.ui.tests.api.IViewActionDelegateTest"

-	   name="IViewActionDelegateTest View"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.api.MockViewPart"/>

-	<view

-       id="org.eclipse.ui.tests.api.IActionFilterTest1"

-	   name="Action Filter Test View 1"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.api.ListView"

-	   menuType="static"/>

-	<view

-       id="org.eclipse.ui.tests.api.IActionFilterTest2"

-	   name="Action Filter Test View 2"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.api.ListView"

-	   menuType="dynamic"/>

-	<view

-       id="org.eclipse.ui.tests.SelectionProviderView"

-	   name="Selection Provider Test View"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.SelectionProviderView"/>

-	<view

-       id="org.eclipse.ui.tests.SelectionProviderView2"

-	   name="Selection Provider Test View 2"

-       icon="icons\view.gif"

-	   class="org.eclipse.ui.tests.SelectionProviderView"/>

-</extension>

-

-<extension

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

-    <editor id ="org.eclipse.ui.tests.api.MockEditorPart1"

-      name="Mock Editor 1"

-      extensions="mock1"

-      icon="icons\mockeditorpart1.gif"

-      class="org.eclipse.ui.tests.api.MockEditorPart">

-    </editor>

-     <editor id ="org.eclipse.ui.tests.api.MockEditorPart2"

-      name="Mock Editor 2"

-      extensions="mock2"

-      icon="icons\mockeditorpart2.gif"

-      class="org.eclipse.ui.tests.api.MockEditorPart">

-    </editor>

-    <editor id ="org.eclipse.ui.tests.api.IEditorActionBarContributorTest"

-      name="IEditorActionBarContributorTest"

-      extensions="mock3"

-      icon="icons\mockeditorpart2.gif"

-      class="org.eclipse.ui.tests.api.MockEditorPart"

-      contributorClass="org.eclipse.ui.tests.api.MockEditorActionBarContributor">

-    </editor>

-    <editor id ="org.eclipse.ui.tests.api.IEditorActionDelegateTest"

-      name="IEditorActionDelegateTest"

-      extensions="mock3"

-      icon="icons\mockeditorpart2.gif"

-      class="org.eclipse.ui.tests.api.MockEditorPart"

-      contributorClass="org.eclipse.ui.tests.api.MockEditorActionBarContributor">

-    </editor>

-    <editor id ="org.eclipse.ui.tests.internal.EditorActionBarsTest"

-      name="IEditorActionBarsTest"

-      extensions="mock3"

-      icon="icons\mockeditorpart2.gif"

-      class="org.eclipse.ui.tests.api.MockEditorPart"

-      contributorClass="org.eclipse.ui.tests.api.MockEditorActionBarContributor">

-    </editor>

-</extension>

-

-<extension point = "org.eclipse.ui.actionSets"> 

-	<actionSet id="org.eclipse.ui.tests.api.MockActionSet"

-		label="Mock Action Set">

-		<action id="org.eclipse.ui.tests.api.MockWindowAction" 

-                label="Mock Action" 

-                menubarPath="additions"

-				class = "org.eclipse.ui.tests.api.MockWorkbenchWindowActionDelegate">

-            </action> 

-    </actionSet> 

-</extension> 

-

-<extension point="org.eclipse.ui.viewActions"> 

-	<viewContribution 

-		id="va1" 

-  		targetID="org.eclipse.ui.tests.api.IViewActionDelegateTest"> 

-		<action id="a1" 

-              label="Mock Action" 

-              menubarPath="additions" 

-              class="org.eclipse.ui.tests.api.MockViewActionDelegate"> 

-		</action> 

-	</viewContribution> 

-</extension> 

-

-<extension point="org.eclipse.ui.editorActions">

-	<editorContribution 

-		id="ea1" 

-  		targetID="org.eclipse.ui.tests.api.IEditorActionDelegateTest"> 

-		<action id="a1" 

-              label="Mock Action" 

-              menubarPath="additions" 

-              class="org.eclipse.ui.tests.api.MockEditorActionDelegate"> 

-		</action> 

-	</editorContribution> 

-</extension> 

-

-<extension point="org.eclipse.ui.popupMenus"> 

-    <objectContribution id="oc1" 

-        objectClass="org.eclipse.ui.tests.api.ListElement"> 

-        <filter name="name" value="red"/> 

-        <action id="oc1" label="redAction" 

-        	class="org.eclipse.ui.tests.api.MockActionDelegate"/> 

-    </objectContribution> 

-    <objectContribution id="oc2" 

-        objectClass="org.eclipse.ui.tests.api.ListElement"> 

-        <filter name="name" value="blue"/> 

-        <action id="oc2" label="blueAction"

-        	class="org.eclipse.ui.tests.api.MockActionDelegate"/>

-    </objectContribution> 

-    <objectContribution id="oc3" 

-        objectClass="org.eclipse.ui.tests.api.ListElement"> 

-        <filter name="flag" value="true"/> 

-        <action id="oc3" label="trueAction"

-			class="org.eclipse.ui.tests.api.MockActionDelegate"/>

-    </objectContribution> 

-    <objectContribution id="oc4" 

-        objectClass="org.eclipse.ui.tests.api.ListElement"> 

-        <filter name="flag" value="false"/> 

-        <action id="oc4" label="falseAction"

-			class="org.eclipse.ui.tests.api.MockActionDelegate"/>

-    </objectContribution> 

-    <objectContribution id="oc5" 

-        objectClass="org.eclipse.ui.tests.api.ListElement"> 

-        <filter name="name" value="red"/> 

-        <filter name="flag" value="true"/> 

-        <action id="oc5" label="redTrueAction"

-        	class="org.eclipse.ui.tests.api.MockActionDelegate"/>

-    </objectContribution> 

-</extension> 

-

-

-</plugin>

diff --git a/tests/org.eclipse.ui.tests/test.xml b/tests/org.eclipse.ui.tests/test.xml
deleted file mode 100644
index 44e644e..0000000
--- a/tests/org.eclipse.ui.tests/test.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>

-

-<project name="testsuite" default="run" basedir=".">

-  <!-- The property ${eclipse-home} should be passed into this script -->

-  <!-- Set a meaningful default value for when it is not. -->

-  <property name="eclipse-home" value="${basedir}\..\.."/>

-

-  <!-- sets the properties eclipse-home, and library-file -->

-  <property name="plugin-name" value="org.eclipse.ui.tests"/>

-  <property name="library-file"

-            value="${eclipse-home}/fragments/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="session-folder" 

-              value="${eclipse-home}/ui_session_sniff_folder"/>

-    <delete dir="${session-folder}" quiet="true"/>

-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">

-      <property name="data-dir" value="${session-folder}"/>

-      <property name="plugin-name" value="${plugin-name}"/>

-      <property name="classname" 

-                value="org.eclipse.ui.tests.api.SessionCreateTest"/>

-    </ant>

-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">

-      <property name="data-dir" value="${session-folder}"/>

-      <property name="plugin-name" value="${plugin-name}"/>

-      <property name="classname"

-                value="org.eclipse.ui.tests.api.SessionRestoreTest"/>

-    </ant>

-

-    <property name="sniff-folder"

-              value="${eclipse-home}/ui_sniff_folder"/>

-    <delete dir="${sniff-folder}" quiet="true"/>

-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">

-      <property name="data-dir" value="${sniff-folder}"/>

-      <property name="plugin-name" value="${plugin-name}"/>

-      <property name="classname"

-                value="org.eclipse.ui.tests.UiTestSuite"/>

-    </ant>

-    

-    <property name="jface-sniff-folder"

-              value="${eclipse-home}/jface_sniff_folder"/>

-    <delete dir="${jface-sniff-folder}" quiet="true"/>

-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">

-      <property name="data-dir" value="${jface-sniff-folder}"/>

-      <property name="plugin-name" value="${plugin-name}"/>

-      <property name="classname"

-                value="org.eclipse.jface.tests.viewers.AllTests"/>

-    </ant>

-  </target>

-

-  <!-- This target holds code to cleanup the testing environment after -->

-  <!-- after all of the tests have been run. You can use this target to -->

-  <!-- delete temporary files that have been created. -->

-  <target name="cleanup">

-  </target>

-

-  <!-- This target runs the test suite. Any actions that need to happen -->

-  <!-- after all the tests have been run should go here. -->

-  <target name="run" depends="init,suite,cleanup">

-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">

-      <property name="includes" value="org*.xml"/>

-      <property name="output-file" value="${plugin-name}.xml"/>

-    </ant>

-  </target>

-

-</project>

diff --git a/tests/org.eclipse.ui.tests/uiSniff b/tests/org.eclipse.ui.tests/uiSniff
deleted file mode 100644
index e2d47e4..0000000
--- a/tests/org.eclipse.ui.tests/uiSniff
+++ /dev/null
@@ -1,10 +0,0 @@
-echo Running ui.TestSuite

-rm -rf 'ui_sniff_folder'

-./jre/bin/java -cp startup.jar org.eclipse.core.launcher.UIMain -application org.eclipse.ui.junit.runner -dev bin -data %LOCATION% -testPluginName org.eclipse.ui.tests -className org.eclipse.ui.tests.UiTestSuite -console  

-

-echo Running ui.api.SessionCreateTest

-rm -rf ui_session_sniff_folder

-./jre/bin/java -cp startup.jar org.eclipse.core.launcher.UIMain -application org.eclipse.ui.junit.runner -dev bin -data %LOCATION% -testPluginName org.eclipse.ui.tests -className org.eclipse.ui.tests.api.SessionCreateTest -console  

-

-echo Running ui.api.SessionRestoreTest

-./jre/bin/java -cp startup.jar org.eclipse.core.launcher.UIMain -application org.eclipse.ui.junit.runner -dev bin -data %LOCATION% -testPluginName org.eclipse.ui.tests -className org.eclipse.ui.tests.api.SessionRestoreTest -console 

diff --git a/tests/org.eclipse.ui.tests/uiSniff.bat b/tests/org.eclipse.ui.tests/uiSniff.bat
deleted file mode 100644
index 84fbc08..0000000
--- a/tests/org.eclipse.ui.tests/uiSniff.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off

-rem This is the UI Sniff test batch file.  

-

-set CLASSPATH=startup.jar

-

-set LOCATION=ui_sniff_folder

-del /Q /S %LOCATION%

-echo Running UiTestSuite

-.\jre\bin\java -cp %CLASSPATH% org.eclipse.core.launcher.UIMain -application org.eclipse.ui.junit.runner -dev bin -data %LOCATION% -testPluginName org.eclipse.ui.tests -className org.eclipse.ui.tests.UiTestSuite -console

-

-set LOCATION=ui_session_sniff_folder

-del /Q /S %LOCATION%

-echo Running SessionCreateTest

-.\jre\bin\java -cp %CLASSPATH% org.eclipse.core.launcher.UIMain -application org.eclipse.ui.junit.runner -dev bin -data %LOCATION% -testPluginName org.eclipse.ui.tests -className org.eclipse.ui.tests.api.SessionCreateTest -console

-echo Running SessionRestoreTest

-.\jre\bin\java -cp %CLASSPATH% org.eclipse.core.launcher.UIMain -application org.eclipse.ui.junit.runner -dev bin -data %LOCATION% -testPluginName org.eclipse.ui.tests -className org.eclipse.ui.tests.api.SessionRestoreTest -console

-