diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider')
25 files changed, 1898 insertions, 556 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineTaskItemProvider.java index ac2f7cf9cc..749cabcc57 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ApiBaselineTaskItemProvider.java @@ -1,21 +1,11 @@ -/* - * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation +/** */ package org.eclipse.emf.cdo.releng.setup.provider; -import org.eclipse.emf.cdo.releng.setup.ApiBaseline; +import org.eclipse.emf.cdo.releng.setup.ApiBaselineTask; import org.eclipse.emf.cdo.releng.setup.SetupPackage; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -24,19 +14,17 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import java.util.Collection; import java.util.List; /** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.ApiBaseline} object. + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.ApiBaselineTask} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ -public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, +public class ApiBaselineTaskItemProvider extends SetupTaskItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -45,7 +33,7 @@ public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEdi * <!-- end-user-doc --> * @generated */ - public ApiBaselineItemProvider(AdapterFactory adapterFactory) + public ApiBaselineTaskItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -78,11 +66,12 @@ public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEdi protected void addVersionPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_ApiBaseline_version_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ApiBaseline_version_feature", "_UI_ApiBaseline_type"), - SetupPackage.Literals.API_BASELINE__VERSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ApiBaselineTask_version_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_ApiBaselineTask_version_feature", + "_UI_ApiBaselineTask_type"), SetupPackage.Literals.API_BASELINE_TASK__VERSION, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -94,26 +83,16 @@ public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEdi protected void addZipLocationPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_ApiBaseline_zipLocation_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ApiBaseline_zipLocation_feature", "_UI_ApiBaseline_type"), - SetupPackage.Literals.API_BASELINE__ZIP_LOCATION, true, false, false, + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ApiBaselineTask_zipLocation_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_ApiBaselineTask_zipLocation_feature", + "_UI_ApiBaselineTask_type"), SetupPackage.Literals.API_BASELINE_TASK__ZIP_LOCATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean hasChildren(Object object) - { - return hasChildren(object, true); - } - - /** - * This returns ApiBaseline.gif. + * This returns ApiBaselineTask.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -121,7 +100,7 @@ public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEdi @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ApiBaseline")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/ApiBaselineTask")); } /** @@ -133,9 +112,9 @@ public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEdi @Override public String getText(Object object) { - String label = ((ApiBaseline)object).getVersion(); - return label == null || label.length() == 0 ? getString("_UI_ApiBaseline_type") : getString("_UI_ApiBaseline_type") - + " " + label; + String label = ((ApiBaselineTask)object).getVersion(); + return label == null || label.length() == 0 ? getString("_UI_ApiBaselineTask_type") + : getString("_UI_ApiBaselineTask_type") + " " + label; } /** @@ -150,10 +129,10 @@ public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEdi { updateChildren(notification); - switch (notification.getFeatureID(ApiBaseline.class)) + switch (notification.getFeatureID(ApiBaselineTask.class)) { - case SetupPackage.API_BASELINE__VERSION: - case SetupPackage.API_BASELINE__ZIP_LOCATION: + case SetupPackage.API_BASELINE_TASK__VERSION: + case SetupPackage.API_BASELINE_TASK__ZIP_LOCATION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } @@ -173,16 +152,4 @@ public class ApiBaselineItemProvider extends ItemProviderAdapter implements IEdi super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() - { - return SetupEditPlugin.INSTANCE; - } - } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BranchItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BranchItemProvider.java index 9693c1bb7c..84c51dcbb6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BranchItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BranchItemProvider.java @@ -11,12 +11,10 @@ package org.eclipse.emf.cdo.releng.setup.provider; import org.eclipse.emf.cdo.releng.setup.Branch; -import org.eclipse.emf.cdo.releng.setup.SetupFactory; import org.eclipse.emf.cdo.releng.setup.SetupPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -36,7 +34,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class BranchItemProvider extends ToolInstallationItemProvider implements IEditingDomainItemProvider, +public class BranchItemProvider extends ConfigurableItemItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -64,9 +62,6 @@ public class BranchItemProvider extends ToolInstallationItemProvider implements super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); - addApiBaselinePropertyDescriptor(object); - addMspecFilePathPropertyDescriptor(object); - addCloneVariableNamePropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -88,86 +83,6 @@ public class BranchItemProvider extends ToolInstallationItemProvider implements } /** - * This adds a property descriptor for the Api Baseline feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addApiBaselinePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Branch_apiBaseline_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Branch_apiBaseline_feature", "_UI_Branch_type"), - SetupPackage.Literals.BRANCH__API_BASELINE, true, false, true, null, null, null)); - } - - /** - * This adds a property descriptor for the Mspec File Path feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addMspecFilePathPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Branch_mspecFilePath_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Branch_mspecFilePath_feature", "_UI_Branch_type"), - SetupPackage.Literals.BRANCH__MSPEC_FILE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); - } - - /** - * This adds a property descriptor for the Clone Variable Name feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void addCloneVariableNamePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Branch_cloneVariableName_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Branch_cloneVariableName_feature", "_UI_Branch_type"), - SetupPackage.Literals.BRANCH__CLONE_VARIABLE_NAME, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); - } - - /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) - { - if (childrenFeatures == null) - { - super.getChildrenFeatures(object); - childrenFeatures.add(SetupPackage.Literals.BRANCH__GIT_CLONES); - } - return childrenFeatures; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EStructuralFeature getChildFeature(Object object, Object child) - { - // Check the type of the specified child object and return the proper feature to use for - // adding (see {@link AddCommand}) it as a child. - - return super.getChildFeature(object, child); - } - - /** * This returns Branch.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -207,13 +122,8 @@ public class BranchItemProvider extends ToolInstallationItemProvider implements switch (notification.getFeatureID(Branch.class)) { case SetupPackage.BRANCH__NAME: - case SetupPackage.BRANCH__MSPEC_FILE_PATH: - case SetupPackage.BRANCH__CLONE_VARIABLE_NAME: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case SetupPackage.BRANCH__GIT_CLONES: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; } super.notifyChanged(notification); } @@ -229,9 +139,6 @@ public class BranchItemProvider extends ToolInstallationItemProvider implements protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.BRANCH__GIT_CLONES, - SetupFactory.eINSTANCE.createGitClone())); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java new file mode 100644 index 0000000000..385b48d9ce --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/BuckminsterImportTaskItemProvider.java @@ -0,0 +1,177 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class BuckminsterImportTaskItemProvider extends OneTimeSetupTaskItemProvider implements + IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, + IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public BuckminsterImportTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addMspecPropertyDescriptor(object); + addTargetPlatformPropertyDescriptor(object); + addBundlePoolPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Mspec feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addMspecPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_BuckminsterImportTask_mspec_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_BuckminsterImportTask_mspec_feature", + "_UI_BuckminsterImportTask_type"), SetupPackage.Literals.BUCKMINSTER_IMPORT_TASK__MSPEC, true, false, + false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Target Platform feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addTargetPlatformPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_BuckminsterImportTask_targetPlatform_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_BuckminsterImportTask_targetPlatform_feature", + "_UI_BuckminsterImportTask_type"), SetupPackage.Literals.BUCKMINSTER_IMPORT_TASK__TARGET_PLATFORM, true, + false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Bundle Pool feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addBundlePoolPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_BuckminsterImportTask_bundlePool_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_BuckminsterImportTask_bundlePool_feature", + "_UI_BuckminsterImportTask_type"), SetupPackage.Literals.BUCKMINSTER_IMPORT_TASK__BUNDLE_POOL, true, false, + false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This returns BuckminsterImportTask.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/BuckminsterImportTask")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) + { + String label = ((BuckminsterImportTask)object).getMspec(); + return label == null || label.length() == 0 ? getString("_UI_BuckminsterImportTask_type") + : getString("_UI_BuckminsterImportTask_type") + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(BuckminsterImportTask.class)) + { + case SetupPackage.BUCKMINSTER_IMPORT_TASK__MSPEC: + case SetupPackage.BUCKMINSTER_IMPORT_TASK__TARGET_PLATFORM: + case SetupPackage.BUCKMINSTER_IMPORT_TASK__BUNDLE_POOL: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java new file mode 100644 index 0000000000..3ba5734f6b --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CompoundSetupTaskItemProvider.java @@ -0,0 +1,204 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.CompoundSetupTask; +import org.eclipse.emf.cdo.releng.setup.SetupFactory; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.CompoundSetupTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class CompoundSetupTaskItemProvider extends SetupTaskItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CompoundSetupTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addNamePropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Name feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addNamePropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_CompoundSetupTask_name_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_CompoundSetupTask_name_feature", + "_UI_CompoundSetupTask_type"), SetupPackage.Literals.COMPOUND_SETUP_TASK__NAME, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) + { + if (childrenFeatures == null) + { + super.getChildrenFeatures(object); + childrenFeatures.add(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS); + } + return childrenFeatures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) + { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** + * This returns CompoundSetupTask.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/CompoundSetupTask")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) + { + String label = ((CompoundSetupTask)object).getName(); + return label == null || label.length() == 0 ? getString("_UI_CompoundSetupTask_type") + : getString("_UI_CompoundSetupTask_type") + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(CompoundSetupTask.class)) + { + case SetupPackage.COMPOUND_SETUP_TASK__NAME: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case SetupPackage.COMPOUND_SETUP_TASK__SETUP_TASKS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createCompoundSetupTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createEclipseIniTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createLinkLocationTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createP2Task())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createBuckminsterImportTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createApiBaselineTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createGitCloneTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createEclipsePreferenceTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createStringVariableTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createWorkingSetTask())); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java new file mode 100644 index 0000000000..8c88c25374 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurableItemItemProvider.java @@ -0,0 +1,93 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.ConfigurableItem} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class ConfigurableItemItemProvider extends SetupTaskContainerItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ConfigurableItemItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) + { + return getString("_UI_ConfigurableItem_type"); + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurationItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurationItemProvider.java index 3bce868991..305272219b 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurationItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ConfigurationItemProvider.java @@ -18,6 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -186,7 +187,7 @@ public class ConfigurationItemProvider extends ItemProviderAdapter implements IE @Override public ResourceLocator getResourceLocator() { - return SetupEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java new file mode 100644 index 0000000000..e2f4cab3a9 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseIniTaskItemProvider.java @@ -0,0 +1,175 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.EclipseIniTask; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; +import org.eclipse.emf.cdo.releng.setup.impl.EclipseIniTaskImpl; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.EclipseIniTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class EclipseIniTaskItemProvider extends InstallTaskItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EclipseIniTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addOptionPropertyDescriptor(object); + addValuePropertyDescriptor(object); + addVmPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Option feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addOptionPropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EclipseIniTask_option_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EclipseIniTask_option_feature", + "_UI_EclipseIniTask_type"), SetupPackage.Literals.ECLIPSE_INI_TASK__OPTION, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Value feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addValuePropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_EclipseIniTask_value_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EclipseIniTask_value_feature", "_UI_EclipseIniTask_type"), + SetupPackage.Literals.ECLIPSE_INI_TASK__VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, null)); + } + + /** + * This adds a property descriptor for the Vm feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addVmPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_EclipseIniTask_vm_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EclipseIniTask_vm_feature", "_UI_EclipseIniTask_type"), + SetupPackage.Literals.ECLIPSE_INI_TASK__VM, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, null)); + } + + /** + * This returns EclipseIniTask.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/EclipseIniTask")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + @Override + public String getText(Object object) + { + EclipseIniTaskImpl task = (EclipseIniTaskImpl)object; + String label = task.getLabel(task.getValue()); + return label == null || label.length() == 0 ? getString("_UI_EclipseIniTask_type") + : getString("_UI_EclipseIniTask_type") + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(EclipseIniTask.class)) + { + case SetupPackage.ECLIPSE_INI_TASK__OPTION: + case SetupPackage.ECLIPSE_INI_TASK__VALUE: + case SetupPackage.ECLIPSE_INI_TASK__VM: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ToolPreferenceItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipsePreferenceTaskItemProvider.java index f3873de108..c05f2f4fe1 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ToolPreferenceItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipsePreferenceTaskItemProvider.java @@ -2,12 +2,11 @@ */ package org.eclipse.emf.cdo.releng.setup.provider; +import org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask; import org.eclipse.emf.cdo.releng.setup.SetupPackage; -import org.eclipse.emf.cdo.releng.setup.ToolPreference; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -16,7 +15,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.core.runtime.Path; @@ -25,12 +23,12 @@ import java.util.Collection; import java.util.List; /** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.ToolPreference} object. + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ -public class ToolPreferenceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, +public class EclipsePreferenceTaskItemProvider extends SetupTaskItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -39,7 +37,7 @@ public class ToolPreferenceItemProvider extends ItemProviderAdapter implements I * <!-- end-user-doc --> * @generated */ - public ToolPreferenceItemProvider(AdapterFactory adapterFactory) + public EclipsePreferenceTaskItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -72,11 +70,12 @@ public class ToolPreferenceItemProvider extends ItemProviderAdapter implements I protected void addKeyPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_ToolPreference_key_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ToolPreference_key_feature", "_UI_ToolPreference_type"), - SetupPackage.Literals.TOOL_PREFERENCE__KEY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EclipsePreferenceTask_key_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EclipsePreferenceTask_key_feature", + "_UI_EclipsePreferenceTask_type"), SetupPackage.Literals.ECLIPSE_PREFERENCE_TASK__KEY, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -88,26 +87,16 @@ public class ToolPreferenceItemProvider extends ItemProviderAdapter implements I protected void addValuePropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_ToolPreference_value_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ToolPreference_value_feature", "_UI_ToolPreference_type"), - SetupPackage.Literals.TOOL_PREFERENCE__VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_EclipsePreferenceTask_value_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_EclipsePreferenceTask_value_feature", + "_UI_EclipsePreferenceTask_type"), SetupPackage.Literals.ECLIPSE_PREFERENCE_TASK__VALUE, true, false, + false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean hasChildren(Object object) - { - return hasChildren(object, true); - } - - /** - * This returns ToolPreference.gif. + * This returns EclipsePreferenceTask.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -115,7 +104,7 @@ public class ToolPreferenceItemProvider extends ItemProviderAdapter implements I @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolPreference")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/EclipsePreferenceTask")); } /** @@ -127,16 +116,16 @@ public class ToolPreferenceItemProvider extends ItemProviderAdapter implements I @Override public String getText(Object object) { - String key = ((ToolPreference)object).getKey(); - String value = ((ToolPreference)object).getValue(); + String key = ((EclipsePreferenceTask)object).getKey(); + String value = ((EclipsePreferenceTask)object).getValue(); if (key != null && key.length() != 0) { - key = new Path(key).lastSegment(); + key = new Path(key).removeFirstSegments(1).toString(); } else if (value == null || value.length() == 0) { - return getString("_UI_ToolPreference_type"); + return getString("_UI_EclipsePreferenceTask_type"); } return "" + key + " = " + value; @@ -154,10 +143,10 @@ public class ToolPreferenceItemProvider extends ItemProviderAdapter implements I { updateChildren(notification); - switch (notification.getFeatureID(ToolPreference.class)) + switch (notification.getFeatureID(EclipsePreferenceTask.class)) { - case SetupPackage.TOOL_PREFERENCE__KEY: - case SetupPackage.TOOL_PREFERENCE__VALUE: + case SetupPackage.ECLIPSE_PREFERENCE_TASK__KEY: + case SetupPackage.ECLIPSE_PREFERENCE_TASK__VALUE: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } @@ -177,16 +166,4 @@ public class ToolPreferenceItemProvider extends ItemProviderAdapter implements I super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() - { - return SetupEditPlugin.INSTANCE; - } - } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java index c729eb3506..24e53824e6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/EclipseVersionItemProvider.java @@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -102,7 +103,7 @@ public class EclipseVersionItemProvider extends ItemProviderAdapter implements I if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(SetupPackage.Literals.ECLIPSE_VERSION__DIRECTOR_CALL); + childrenFeatures.add(SetupPackage.Literals.ECLIPSE_VERSION__INSTALL_TASKS); } return childrenFeatures; } @@ -175,7 +176,7 @@ public class EclipseVersionItemProvider extends ItemProviderAdapter implements I case SetupPackage.ECLIPSE_VERSION__VERSION: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case SetupPackage.ECLIPSE_VERSION__DIRECTOR_CALL: + case SetupPackage.ECLIPSE_VERSION__INSTALL_TASKS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -194,8 +195,14 @@ public class EclipseVersionItemProvider extends ItemProviderAdapter implements I { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.ECLIPSE_VERSION__DIRECTOR_CALL, - SetupFactory.eINSTANCE.createDirectorCall())); + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.ECLIPSE_VERSION__INSTALL_TASKS, + SetupFactory.eINSTANCE.createEclipseIniTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.ECLIPSE_VERSION__INSTALL_TASKS, + SetupFactory.eINSTANCE.createLinkLocationTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.ECLIPSE_VERSION__INSTALL_TASKS, + SetupFactory.eINSTANCE.createP2Task())); } /** @@ -207,7 +214,7 @@ public class EclipseVersionItemProvider extends ItemProviderAdapter implements I @Override public ResourceLocator getResourceLocator() { - return SetupEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneTaskItemProvider.java index 1502c52e00..e08efe55b4 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/GitCloneTaskItemProvider.java @@ -1,21 +1,12 @@ -/* - * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation +/** */ package org.eclipse.emf.cdo.releng.setup.provider; -import org.eclipse.emf.cdo.releng.setup.GitClone; +import org.eclipse.emf.cdo.releng.setup.GitCloneTask; import org.eclipse.emf.cdo.releng.setup.SetupPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -24,19 +15,18 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import java.util.Collection; import java.util.List; /** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.GitClone} object. + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.GitCloneTask} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ -public class GitCloneItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, +public class GitCloneTaskItemProvider extends SetupTaskItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -45,7 +35,7 @@ public class GitCloneItemProvider extends ItemProviderAdapter implements IEditin * <!-- end-user-doc --> * @generated */ - public GitCloneItemProvider(AdapterFactory adapterFactory) + public GitCloneTaskItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -64,6 +54,7 @@ public class GitCloneItemProvider extends ItemProviderAdapter implements IEditin super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); + addRemoteNamePropertyDescriptor(object); addRemoteURIPropertyDescriptor(object); addCheckoutBranchPropertyDescriptor(object); } @@ -80,57 +71,65 @@ public class GitCloneItemProvider extends ItemProviderAdapter implements IEditin { itemPropertyDescriptors.add(createItemPropertyDescriptor( ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_GitClone_name_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_GitClone_name_feature", "_UI_GitClone_type"), - SetupPackage.Literals.GIT_CLONE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, - null)); + getString("_UI_GitCloneTask_name_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GitCloneTask_name_feature", "_UI_GitCloneTask_type"), + SetupPackage.Literals.GIT_CLONE_TASK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, null)); } /** - * This adds a property descriptor for the Remote URI feature. + * This adds a property descriptor for the Remote Name feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void addRemoteURIPropertyDescriptor(Object object) + protected void addRemoteNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_GitClone_remoteURI_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_GitClone_remoteURI_feature", "_UI_GitClone_type"), - SetupPackage.Literals.GIT_CLONE__REMOTE_URI, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_GitCloneTask_remoteName_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GitCloneTask_remoteName_feature", + "_UI_GitCloneTask_type"), SetupPackage.Literals.GIT_CLONE_TASK__REMOTE_NAME, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This adds a property descriptor for the Checkout Branch feature. + * This adds a property descriptor for the Remote URI feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void addCheckoutBranchPropertyDescriptor(Object object) + protected void addRemoteURIPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor( ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_GitClone_checkoutBranch_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_GitClone_checkoutBranch_feature", "_UI_GitClone_type"), - SetupPackage.Literals.GIT_CLONE__CHECKOUT_BRANCH, true, false, false, + getString("_UI_GitCloneTask_remoteURI_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GitCloneTask_remoteURI_feature", "_UI_GitCloneTask_type"), + SetupPackage.Literals.GIT_CLONE_TASK__REMOTE_URI, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** + * This adds a property descriptor for the Checkout Branch feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - @Override - public boolean hasChildren(Object object) + protected void addCheckoutBranchPropertyDescriptor(Object object) { - return hasChildren(object, true); + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_GitCloneTask_checkoutBranch_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_GitCloneTask_checkoutBranch_feature", + "_UI_GitCloneTask_type"), SetupPackage.Literals.GIT_CLONE_TASK__CHECKOUT_BRANCH, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This returns GitClone.gif. + * This returns GitCloneTask.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -138,7 +137,7 @@ public class GitCloneItemProvider extends ItemProviderAdapter implements IEditin @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/GitClone")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/GitCloneTask")); } /** @@ -150,11 +149,11 @@ public class GitCloneItemProvider extends ItemProviderAdapter implements IEditin @Override public String getText(Object object) { - String uri = ((GitClone)object).getRemoteURI(); - String branch = ((GitClone)object).getCheckoutBranch(); + String uri = ((GitCloneTask)object).getRemoteURI(); + String branch = ((GitCloneTask)object).getCheckoutBranch(); if ((uri == null || uri.length() == 0) && (branch == null || branch.length() == 0)) { - return getString("_UI_GitClone_type"); + return getString("_UI_GitCloneTask_type"); } return "" + uri + " (" + branch + ")"; @@ -172,11 +171,12 @@ public class GitCloneItemProvider extends ItemProviderAdapter implements IEditin { updateChildren(notification); - switch (notification.getFeatureID(GitClone.class)) + switch (notification.getFeatureID(GitCloneTask.class)) { - case SetupPackage.GIT_CLONE__NAME: - case SetupPackage.GIT_CLONE__REMOTE_URI: - case SetupPackage.GIT_CLONE__CHECKOUT_BRANCH: + case SetupPackage.GIT_CLONE_TASK__NAME: + case SetupPackage.GIT_CLONE_TASK__REMOTE_NAME: + case SetupPackage.GIT_CLONE_TASK__REMOTE_URI: + case SetupPackage.GIT_CLONE_TASK__CHECKOUT_BRANCH: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } @@ -196,16 +196,4 @@ public class GitCloneItemProvider extends ItemProviderAdapter implements IEditin super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() - { - return SetupEditPlugin.INSTANCE; - } - } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallTaskItemProvider.java new file mode 100644 index 0000000000..08ab5b715f --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallTaskItemProvider.java @@ -0,0 +1,99 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.InstallTask; +import org.eclipse.emf.cdo.releng.setup.SetupTaskScope; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.InstallTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class InstallTaskItemProvider extends SetupTaskItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public InstallTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) + { + SetupTaskScope labelValue = ((InstallTask)object).getScope(); + String label = labelValue == null ? null : labelValue.toString(); + return label == null || label.length() == 0 ? getString("_UI_InstallTask_type") : getString("_UI_InstallTask_type") + + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java index 626906c9f8..7113ea59d9 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java @@ -17,6 +17,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -168,7 +169,7 @@ public class InstallableUnitItemProvider extends ItemProviderAdapter implements @Override public ResourceLocator getResourceLocator() { - return SetupEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationTaskItemProvider.java index 2570210119..5d97a0c673 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/LinkLocationTaskItemProvider.java @@ -2,12 +2,11 @@ */ package org.eclipse.emf.cdo.releng.setup.provider; -import org.eclipse.emf.cdo.releng.setup.LinkLocation; +import org.eclipse.emf.cdo.releng.setup.LinkLocationTask; import org.eclipse.emf.cdo.releng.setup.SetupPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -16,19 +15,18 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import java.util.Collection; import java.util.List; /** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.LinkLocation} object. + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.LinkLocationTask} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ -public class LinkLocationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, +public class LinkLocationTaskItemProvider extends InstallTaskItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -37,7 +35,7 @@ public class LinkLocationItemProvider extends ItemProviderAdapter implements IEd * <!-- end-user-doc --> * @generated */ - public LinkLocationItemProvider(AdapterFactory adapterFactory) + public LinkLocationTaskItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -70,11 +68,12 @@ public class LinkLocationItemProvider extends ItemProviderAdapter implements IEd protected void addPathPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_LinkLocation_path_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_LinkLocation_path_feature", "_UI_LinkLocation_type"), - SetupPackage.Literals.LINK_LOCATION__PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_LinkLocationTask_path_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_LinkLocationTask_path_feature", + "_UI_LinkLocationTask_type"), SetupPackage.Literals.LINK_LOCATION_TASK__PATH, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -86,26 +85,16 @@ public class LinkLocationItemProvider extends ItemProviderAdapter implements IEd protected void addNamePropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_LinkLocation_name_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_LinkLocation_name_feature", "_UI_LinkLocation_type"), - SetupPackage.Literals.LINK_LOCATION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, null)); + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_LinkLocationTask_name_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_LinkLocationTask_name_feature", + "_UI_LinkLocationTask_type"), SetupPackage.Literals.LINK_LOCATION_TASK__NAME, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean hasChildren(Object object) - { - return hasChildren(object, true); - } - - /** - * This returns LinkLocation.gif. + * This returns LinkLocationTask.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -113,7 +102,7 @@ public class LinkLocationItemProvider extends ItemProviderAdapter implements IEd @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/LinkLocation")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/LinkLocationTask")); } /** @@ -125,9 +114,9 @@ public class LinkLocationItemProvider extends ItemProviderAdapter implements IEd @Override public String getText(Object object) { - String label = ((LinkLocation)object).getPath(); - return label == null || label.length() == 0 ? getString("_UI_LinkLocation_type") - : getString("_UI_LinkLocation_type") + " " + label; + String label = ((LinkLocationTask)object).getPath(); + return label == null || label.length() == 0 ? getString("_UI_LinkLocationTask_type") + : getString("_UI_LinkLocationTask_type") + " " + label; } /** @@ -142,10 +131,10 @@ public class LinkLocationItemProvider extends ItemProviderAdapter implements IEd { updateChildren(notification); - switch (notification.getFeatureID(LinkLocation.class)) + switch (notification.getFeatureID(LinkLocationTask.class)) { - case SetupPackage.LINK_LOCATION__PATH: - case SetupPackage.LINK_LOCATION__NAME: + case SetupPackage.LINK_LOCATION_TASK__PATH: + case SetupPackage.LINK_LOCATION_TASK__NAME: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } @@ -165,16 +154,4 @@ public class LinkLocationItemProvider extends ItemProviderAdapter implements IEd super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() - { - return SetupEditPlugin.INSTANCE; - } - } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java new file mode 100644 index 0000000000..d0a42aa51d --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/OneTimeSetupTaskItemProvider.java @@ -0,0 +1,127 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.OneTimeSetupTask; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.OneTimeSetupTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class OneTimeSetupTaskItemProvider extends SetupTaskItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public OneTimeSetupTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addIdPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Id feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addIdPropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_OneTimeSetupTask_id_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_OneTimeSetupTask_id_feature", + "_UI_OneTimeSetupTask_type"), SetupPackage.Literals.ONE_TIME_SETUP_TASK__ID, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) + { + String label = ((OneTimeSetupTask)object).getId(); + return label == null || label.length() == 0 ? getString("_UI_OneTimeSetupTask_type") + : getString("_UI_OneTimeSetupTask_type") + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(OneTimeSetupTask.class)) + { + case SetupPackage.ONE_TIME_SETUP_TASK__ID: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2RepositoryItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2RepositoryItemProvider.java index 2fe20cbadc..1bd27fc50a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2RepositoryItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2RepositoryItemProvider.java @@ -17,6 +17,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -163,7 +164,7 @@ public class P2RepositoryItemProvider extends ItemProviderAdapter implements IEd @Override public ResourceLocator getResourceLocator() { - return SetupEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ToolInstallationItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2TaskItemProvider.java index 1eb56f1298..a8a89a601f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ToolInstallationItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/P2TaskItemProvider.java @@ -1,22 +1,12 @@ -/* - * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation +/** */ package org.eclipse.emf.cdo.releng.setup.provider; +import org.eclipse.emf.cdo.releng.setup.P2Task; import org.eclipse.emf.cdo.releng.setup.SetupFactory; import org.eclipse.emf.cdo.releng.setup.SetupPackage; -import org.eclipse.emf.cdo.releng.setup.ToolInstallation; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -24,19 +14,17 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import java.util.Collection; import java.util.List; /** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.ToolInstallation} object. + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.P2Task} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ -public class ToolInstallationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, +public class P2TaskItemProvider extends InstallTaskItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -45,7 +33,7 @@ public class ToolInstallationItemProvider extends ItemProviderAdapter implements * <!-- end-user-doc --> * @generated */ - public ToolInstallationItemProvider(AdapterFactory adapterFactory) + public P2TaskItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -81,8 +69,8 @@ public class ToolInstallationItemProvider extends ItemProviderAdapter implements if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(SetupPackage.Literals.TOOL_INSTALLATION__DIRECTOR_CALLS); - childrenFeatures.add(SetupPackage.Literals.TOOL_INSTALLATION__TOOL_PREFERENCES); + childrenFeatures.add(SetupPackage.Literals.P2_TASK__P2_REPOSITORIES); + childrenFeatures.add(SetupPackage.Literals.P2_TASK__INSTALLABLE_UNITS); } return childrenFeatures; } @@ -102,18 +90,7 @@ public class ToolInstallationItemProvider extends ItemProviderAdapter implements } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean hasChildren(Object object) - { - return hasChildren(object, true); - } - - /** - * This returns ToolInstallation.gif. + * This returns P2Task.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -121,19 +98,19 @@ public class ToolInstallationItemProvider extends ItemProviderAdapter implements @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolInstallation")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/P2Task")); } /** * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ @Override public String getText(Object object) { - return getString("_UI_ToolInstallation_type"); + return getString("_UI_P2Task_type"); } /** @@ -148,10 +125,10 @@ public class ToolInstallationItemProvider extends ItemProviderAdapter implements { updateChildren(notification); - switch (notification.getFeatureID(ToolInstallation.class)) + switch (notification.getFeatureID(P2Task.class)) { - case SetupPackage.TOOL_INSTALLATION__DIRECTOR_CALLS: - case SetupPackage.TOOL_INSTALLATION__TOOL_PREFERENCES: + case SetupPackage.P2_TASK__P2_REPOSITORIES: + case SetupPackage.P2_TASK__INSTALLABLE_UNITS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -170,23 +147,11 @@ public class ToolInstallationItemProvider extends ItemProviderAdapter implements { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.TOOL_INSTALLATION__DIRECTOR_CALLS, - SetupFactory.eINSTANCE.createDirectorCall())); - - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.TOOL_INSTALLATION__TOOL_PREFERENCES, - SetupFactory.eINSTANCE.createToolPreference())); - } + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.P2_TASK__P2_REPOSITORIES, + SetupFactory.eINSTANCE.createP2Repository())); - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() - { - return SetupEditPlugin.INSTANCE; + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.P2_TASK__INSTALLABLE_UNITS, + SetupFactory.eINSTANCE.createInstallableUnit())); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java index 729cc60242..bf04c2f0a3 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java @@ -11,11 +11,10 @@ package org.eclipse.emf.cdo.releng.setup.provider; import org.eclipse.emf.cdo.releng.setup.Preferences; -import org.eclipse.emf.cdo.releng.setup.SetupFactory; import org.eclipse.emf.cdo.releng.setup.SetupPackage; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -25,6 +24,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; + import java.util.Collection; import java.util.List; @@ -34,7 +34,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class PreferencesItemProvider extends ToolInstallationItemProvider implements IEditingDomainItemProvider, +public class PreferencesItemProvider extends SetupTaskContainerItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -119,39 +119,6 @@ public class PreferencesItemProvider extends ToolInstallationItemProvider implem } /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) - { - if (childrenFeatures == null) - { - super.getChildrenFeatures(object); - childrenFeatures.add(SetupPackage.Literals.PREFERENCES__LINK_LOCATIONS); - } - return childrenFeatures; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EStructuralFeature getChildFeature(Object object, Object child) - { - // Check the type of the specified child object and return the proper feature to use for - // adding (see {@link AddCommand}) it as a child. - - return super.getChildFeature(object, child); - } - - /** * This returns Preferences.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -196,9 +163,6 @@ public class PreferencesItemProvider extends ToolInstallationItemProvider implem case SetupPackage.PREFERENCES__GIT_PREFIX: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case SetupPackage.PREFERENCES__LINK_LOCATIONS: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; } super.notifyChanged(notification); } @@ -214,9 +178,6 @@ public class PreferencesItemProvider extends ToolInstallationItemProvider implem protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.PREFERENCES__LINK_LOCATIONS, - SetupFactory.eINSTANCE.createLinkLocation())); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ProjectItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ProjectItemProvider.java index f68b2d32fb..88e402947f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ProjectItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/ProjectItemProvider.java @@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.releng.setup.Project; import org.eclipse.emf.cdo.releng.setup.SetupFactory; import org.eclipse.emf.cdo.releng.setup.SetupPackage; -import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -37,7 +36,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class ProjectItemProvider extends ToolInstallationItemProvider implements IEditingDomainItemProvider, +public class ProjectItemProvider extends ConfigurableItemItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** @@ -100,8 +99,6 @@ public class ProjectItemProvider extends ToolInstallationItemProvider implements { super.getChildrenFeatures(object); childrenFeatures.add(SetupPackage.Literals.PROJECT__BRANCHES); - childrenFeatures.add(SetupPackage.Literals.PROJECT__API_BASELINES); - childrenFeatures.add(SetupPackage.Literals.PROJECT__WORKING_SET_GROUP); } return childrenFeatures; } @@ -163,8 +160,6 @@ public class ProjectItemProvider extends ToolInstallationItemProvider implements fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case SetupPackage.PROJECT__BRANCHES: - case SetupPackage.PROJECT__API_BASELINES: - case SetupPackage.PROJECT__WORKING_SET_GROUP: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -185,12 +180,6 @@ public class ProjectItemProvider extends ToolInstallationItemProvider implements newChildDescriptors.add(createChildParameter(SetupPackage.Literals.PROJECT__BRANCHES, SetupFactory.eINSTANCE.createBranch())); - - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.PROJECT__API_BASELINES, - SetupFactory.eINSTANCE.createApiBaseline())); - - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.PROJECT__WORKING_SET_GROUP, - WorkingSetsFactory.eINSTANCE.createWorkingSetGroup())); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupEditPlugin.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupEditPlugin.java index 304ee79e5b..7ebfc5d7e9 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupEditPlugin.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupEditPlugin.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.releng.setup.provider; import org.eclipse.emf.cdo.releng.workingsets.provider.WorkingSetsEditPlugin; + import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProvider.java index 24fa6c1389..fc4dfcf618 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProvider.java @@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -117,7 +118,6 @@ public class SetupItemProvider extends ItemProviderAdapter implements IEditingDo childrenFeatures.add(SetupPackage.Literals.SETUP__BRANCH); childrenFeatures.add(SetupPackage.Literals.SETUP__ECLIPSE_VERSION); childrenFeatures.add(SetupPackage.Literals.SETUP__PREFERENCES); - childrenFeatures.add(SetupPackage.Literals.SETUP__UPDATE_LOCATIONS); } return childrenFeatures; } @@ -186,7 +186,6 @@ public class SetupItemProvider extends ItemProviderAdapter implements IEditingDo switch (notification.getFeatureID(Setup.class)) { case SetupPackage.SETUP__PREFERENCES: - case SetupPackage.SETUP__UPDATE_LOCATIONS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -207,9 +206,6 @@ public class SetupItemProvider extends ItemProviderAdapter implements IEditingDo newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP__PREFERENCES, SetupFactory.eINSTANCE.createPreferences())); - - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP__UPDATE_LOCATIONS, - SetupFactory.eINSTANCE.createP2Repository())); } /** @@ -221,7 +217,7 @@ public class SetupItemProvider extends ItemProviderAdapter implements IEditingDo @Override public ResourceLocator getResourceLocator() { - return SetupEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProviderAdapterFactory.java index d2d21a513e..c6780e34d6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupItemProviderAdapterFactory.java @@ -10,15 +10,20 @@ */ package org.eclipse.emf.cdo.releng.setup.provider; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; import org.eclipse.emf.cdo.releng.setup.util.SetupAdapterFactory; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.provider.ChangeNotifier; +import org.eclipse.emf.edit.provider.ChildCreationExtenderManager; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.IChangeNotifier; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IDisposable; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -29,6 +34,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * This is the factory that is used to provide the interfaces needed to support Viewers. @@ -40,7 +46,7 @@ import java.util.Collection; * @generated */ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory implements ComposeableAdapterFactory, - IChangeNotifier, IDisposable + IChangeNotifier, IDisposable, IChildCreationExtender { /** * This keeps track of the root adapter factory that delegates to this adapter factory. @@ -59,6 +65,15 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme protected IChangeNotifier changeNotifier = new ChangeNotifier(); /** + * This helps manage the child creation extenders. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager( + SetupEditPlugin.INSTANCE, SetupPackage.eNS_URI); + + /** * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -157,6 +172,56 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme } /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.ApiBaselineTask} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ApiBaselineTaskItemProvider apiBaselineTaskItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.ApiBaselineTask}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createApiBaselineTaskAdapter() + { + if (apiBaselineTaskItemProvider == null) + { + apiBaselineTaskItemProvider = new ApiBaselineTaskItemProvider(this); + } + + return apiBaselineTaskItemProvider; + } + + /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.GitCloneTask} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected GitCloneTaskItemProvider gitCloneTaskItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.GitCloneTask}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createGitCloneTaskAdapter() + { + if (gitCloneTaskItemProvider == null) + { + gitCloneTaskItemProvider = new GitCloneTaskItemProvider(this); + } + + return gitCloneTaskItemProvider; + } + + /** * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.EclipseVersion} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -182,28 +247,28 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.DirectorCall} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.P2Task} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected DirectorCallItemProvider directorCallItemProvider; + protected P2TaskItemProvider p2TaskItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.DirectorCall}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.P2Task}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ @Override - public Adapter createDirectorCallAdapter() + public Adapter createP2TaskAdapter() { - if (directorCallItemProvider == null) + if (p2TaskItemProvider == null) { - directorCallItemProvider = new DirectorCallItemProvider(this); + p2TaskItemProvider = new P2TaskItemProvider(this); } - return directorCallItemProvider; + return p2TaskItemProvider; } /** @@ -257,128 +322,153 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.ApiBaseline} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.Setup} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected ApiBaselineItemProvider apiBaselineItemProvider; + protected SetupItemProvider setupItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.ApiBaseline}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.Setup}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ @Override - public Adapter createApiBaselineAdapter() + public Adapter createSetupAdapter() { - if (apiBaselineItemProvider == null) + if (setupItemProvider == null) { - apiBaselineItemProvider = new ApiBaselineItemProvider(this); + setupItemProvider = new SetupItemProvider(this); } - return apiBaselineItemProvider; + return setupItemProvider; } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.GitClone} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.WorkingSetTask} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected GitCloneItemProvider gitCloneItemProvider; + protected WorkingSetTaskItemProvider workingSetTaskItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.GitClone}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.WorkingSetTask}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ @Override - public Adapter createGitCloneAdapter() + public Adapter createWorkingSetTaskAdapter() { - if (gitCloneItemProvider == null) + if (workingSetTaskItemProvider == null) { - gitCloneItemProvider = new GitCloneItemProvider(this); + workingSetTaskItemProvider = new WorkingSetTaskItemProvider(this); } - return gitCloneItemProvider; + return workingSetTaskItemProvider; } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.Setup} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.EclipseIniTask} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected SetupItemProvider setupItemProvider; + protected EclipseIniTaskItemProvider eclipseIniTaskItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.Setup}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.EclipseIniTask}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ @Override - public Adapter createSetupAdapter() + public Adapter createEclipseIniTaskAdapter() { - if (setupItemProvider == null) + if (eclipseIniTaskItemProvider == null) { - setupItemProvider = new SetupItemProvider(this); + eclipseIniTaskItemProvider = new EclipseIniTaskItemProvider(this); } - return setupItemProvider; + return eclipseIniTaskItemProvider; + } + + /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.CompoundSetupTask} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected CompoundSetupTaskItemProvider compoundSetupTaskItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.CompoundSetupTask}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createCompoundSetupTaskAdapter() + { + if (compoundSetupTaskItemProvider == null) + { + compoundSetupTaskItemProvider = new CompoundSetupTaskItemProvider(this); + } + + return compoundSetupTaskItemProvider; } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.ToolPreference} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected ToolPreferenceItemProvider toolPreferenceItemProvider; + protected BuckminsterImportTaskItemProvider buckminsterImportTaskItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.ToolPreference}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ @Override - public Adapter createToolPreferenceAdapter() + public Adapter createBuckminsterImportTaskAdapter() { - if (toolPreferenceItemProvider == null) + if (buckminsterImportTaskItemProvider == null) { - toolPreferenceItemProvider = new ToolPreferenceItemProvider(this); + buckminsterImportTaskItemProvider = new BuckminsterImportTaskItemProvider(this); } - return toolPreferenceItemProvider; + return buckminsterImportTaskItemProvider; } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.LinkLocation} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.StringVariableTask} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected LinkLocationItemProvider linkLocationItemProvider; + protected StringVariableTaskItemProvider stringVariableTaskItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.LinkLocation}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.StringVariableTask}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ @Override - public Adapter createLinkLocationAdapter() + public Adapter createStringVariableTaskAdapter() { - if (linkLocationItemProvider == null) + if (stringVariableTaskItemProvider == null) { - linkLocationItemProvider = new LinkLocationItemProvider(this); + stringVariableTaskItemProvider = new StringVariableTaskItemProvider(this); } - return linkLocationItemProvider; + return stringVariableTaskItemProvider; } /** @@ -407,6 +497,56 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme } /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.LinkLocationTask} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected LinkLocationTaskItemProvider linkLocationTaskItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.LinkLocationTask}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createLinkLocationTaskAdapter() + { + if (linkLocationTaskItemProvider == null) + { + linkLocationTaskItemProvider = new LinkLocationTaskItemProvider(this); + } + + return linkLocationTaskItemProvider; + } + + /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected EclipsePreferenceTaskItemProvider eclipsePreferenceTaskItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createEclipsePreferenceTaskAdapter() + { + if (eclipsePreferenceTaskItemProvider == null) + { + eclipsePreferenceTaskItemProvider = new EclipsePreferenceTaskItemProvider(this); + } + + return eclipsePreferenceTaskItemProvider; + } + + /** * This returns the root adapter factory that contains this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -472,6 +612,36 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public List<IChildCreationExtender> getChildCreationExtenders() + { + return childCreationExtenderManager.getChildCreationExtenders(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) + { + return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ResourceLocator getResourceLocator() + { + return childCreationExtenderManager; + } + + /** * This adds a listener. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -517,32 +687,42 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme */ public void dispose() { - if (preferencesItemProvider != null) - preferencesItemProvider.dispose(); - if (linkLocationItemProvider != null) - linkLocationItemProvider.dispose(); - if (toolPreferenceItemProvider != null) - toolPreferenceItemProvider.dispose(); if (eclipseVersionItemProvider != null) eclipseVersionItemProvider.dispose(); - if (directorCallItemProvider != null) - directorCallItemProvider.dispose(); - if (installableUnitItemProvider != null) - installableUnitItemProvider.dispose(); - if (p2RepositoryItemProvider != null) - p2RepositoryItemProvider.dispose(); if (configurationItemProvider != null) configurationItemProvider.dispose(); if (projectItemProvider != null) projectItemProvider.dispose(); if (branchItemProvider != null) branchItemProvider.dispose(); - if (apiBaselineItemProvider != null) - apiBaselineItemProvider.dispose(); - if (gitCloneItemProvider != null) - gitCloneItemProvider.dispose(); + if (preferencesItemProvider != null) + preferencesItemProvider.dispose(); if (setupItemProvider != null) setupItemProvider.dispose(); + if (compoundSetupTaskItemProvider != null) + compoundSetupTaskItemProvider.dispose(); + if (eclipseIniTaskItemProvider != null) + eclipseIniTaskItemProvider.dispose(); + if (linkLocationTaskItemProvider != null) + linkLocationTaskItemProvider.dispose(); + if (p2TaskItemProvider != null) + p2TaskItemProvider.dispose(); + if (installableUnitItemProvider != null) + installableUnitItemProvider.dispose(); + if (p2RepositoryItemProvider != null) + p2RepositoryItemProvider.dispose(); + if (buckminsterImportTaskItemProvider != null) + buckminsterImportTaskItemProvider.dispose(); + if (apiBaselineTaskItemProvider != null) + apiBaselineTaskItemProvider.dispose(); + if (gitCloneTaskItemProvider != null) + gitCloneTaskItemProvider.dispose(); + if (eclipsePreferenceTaskItemProvider != null) + eclipsePreferenceTaskItemProvider.dispose(); + if (stringVariableTaskItemProvider != null) + stringVariableTaskItemProvider.dispose(); + if (workingSetTaskItemProvider != null) + workingSetTaskItemProvider.dispose(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/DirectorCallItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java index 889cb6a6ee..7476232ab6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/DirectorCallItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java @@ -1,25 +1,15 @@ -/* - * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation +/** */ package org.eclipse.emf.cdo.releng.setup.provider; -import org.eclipse.emf.cdo.releng.setup.DirectorCall; -import org.eclipse.emf.cdo.releng.setup.InstallableUnit; import org.eclipse.emf.cdo.releng.setup.SetupFactory; import org.eclipse.emf.cdo.releng.setup.SetupPackage; - +import org.eclipse.emf.cdo.releng.setup.SetupTaskContainer; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -28,30 +18,25 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import java.util.Collection; import java.util.List; /** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.DirectorCall} object. + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.SetupTaskContainer} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ -public class DirectorCallItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, +public class SetupTaskContainerItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { - private static final String PREFIX = "org.eclipse."; - - private static final String SUFFIX = ".feature.group"; - /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public DirectorCallItemProvider(AdapterFactory adapterFactory) + public SetupTaskContainerItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -87,8 +72,7 @@ public class DirectorCallItemProvider extends ItemProviderAdapter implements IEd if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(SetupPackage.Literals.DIRECTOR_CALL__INSTALLABLE_UNITS); - childrenFeatures.add(SetupPackage.Literals.DIRECTOR_CALL__P2_REPOSITORIES); + childrenFeatures.add(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS); } return childrenFeatures; } @@ -119,56 +103,15 @@ public class DirectorCallItemProvider extends ItemProviderAdapter implements IEd } /** - * This returns DirectorCall.gif. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object getImage(Object object) - { - return overlayImage(object, getResourceLocator().getImage("full/obj16/DirectorCall")); - } - - /** * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated NOT + * @generated */ @Override public String getText(Object object) { - DirectorCall directorCall = (DirectorCall)object; - EList<InstallableUnit> installableUnits = directorCall.getInstallableUnits(); - if (!installableUnits.isEmpty()) - { - StringBuilder builder = new StringBuilder(); - for (InstallableUnit installableUnit : installableUnits) - { - if (builder.length() > 0) - { - builder.append(", "); - } - - String id = installableUnit.getId(); - if (id.startsWith(PREFIX)) - { - id = id.substring(PREFIX.length()); - } - - if (id.endsWith(SUFFIX)) - { - id = id.substring(0, id.length() - SUFFIX.length()); - } - - builder.append(id); - } - - return getString("_UI_DirectorCall_type") + " (" + builder + ")"; - } - - return getString("_UI_DirectorCall_type"); + return getString("_UI_SetupTaskContainer_type"); } /** @@ -183,10 +126,9 @@ public class DirectorCallItemProvider extends ItemProviderAdapter implements IEd { updateChildren(notification); - switch (notification.getFeatureID(DirectorCall.class)) + switch (notification.getFeatureID(SetupTaskContainer.class)) { - case SetupPackage.DIRECTOR_CALL__INSTALLABLE_UNITS: - case SetupPackage.DIRECTOR_CALL__P2_REPOSITORIES: + case SetupPackage.SETUP_TASK_CONTAINER__SETUP_TASKS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -205,11 +147,35 @@ public class DirectorCallItemProvider extends ItemProviderAdapter implements IEd { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.DIRECTOR_CALL__INSTALLABLE_UNITS, - SetupFactory.eINSTANCE.createInstallableUnit())); + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createCompoundSetupTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createEclipseIniTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createLinkLocationTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createP2Task())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createBuckminsterImportTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createApiBaselineTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createGitCloneTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createEclipsePreferenceTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createStringVariableTask())); - newChildDescriptors.add(createChildParameter(SetupPackage.Literals.DIRECTOR_CALL__P2_REPOSITORIES, - SetupFactory.eINSTANCE.createP2Repository())); + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createWorkingSetTask())); } /** @@ -221,7 +187,7 @@ public class DirectorCallItemProvider extends ItemProviderAdapter implements IEd @Override public ResourceLocator getResourceLocator() { - return SetupEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java new file mode 100644 index 0000000000..9fdd347108 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskItemProvider.java @@ -0,0 +1,239 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.Configuration; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; +import org.eclipse.emf.cdo.releng.setup.SetupTask; +import org.eclipse.emf.cdo.releng.setup.SetupTaskScope; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.SetupTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class SetupTaskItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public SetupTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addRequirementsPropertyDescriptor(object); + addRestrictionsPropertyDescriptor(object); + addScopePropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Requirements feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + protected void addRequirementsPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), getString("_UI_SetupTask_requirements_feature"), getString( + "_UI_PropertyDescriptor_description", "_UI_SetupTask_requirements_feature", "_UI_SetupTask_type"), + SetupPackage.Literals.SETUP_TASK__REQUIREMENTS, true, false, true, null, null, null) + { + private IItemLabelProvider labelProvider = new HierarchicalItemLabelProvider(itemDelegator); + + @Override + public IItemLabelProvider getLabelProvider(Object object) + { + return labelProvider; + } + }); + } + + /** + * This adds a property descriptor for the Restrictions feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + protected void addRestrictionsPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), getString("_UI_SetupTask_restrictions_feature"), getString( + "_UI_PropertyDescriptor_description", "_UI_SetupTask_restrictions_feature", "_UI_SetupTask_type"), + SetupPackage.Literals.SETUP_TASK__RESTRICTIONS, true, false, true, null, null, null) + { + private IItemLabelProvider labelProvider = new HierarchicalItemLabelProvider(itemDelegator); + + @Override + public IItemLabelProvider getLabelProvider(Object object) + { + return labelProvider; + } + }); + } + + /** + * This adds a property descriptor for the Scope feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addScopePropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SetupTask_scope_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_SetupTask_scope_feature", "_UI_SetupTask_type"), + SetupPackage.Literals.SETUP_TASK__SCOPE, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, + null)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean hasChildren(Object object) + { + return hasChildren(object, true); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) + { + SetupTaskScope labelValue = ((SetupTask)object).getScope(); + String label = labelValue == null ? null : labelValue.toString(); + return label == null || label.length() == 0 ? getString("_UI_SetupTask_type") : getString("_UI_SetupTask_type") + + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(SetupTask.class)) + { + case SetupPackage.SETUP_TASK__SCOPE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public ResourceLocator getResourceLocator() + { + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); + } + + /** + * @author Eike Stepper + */ + private static class HierarchicalItemLabelProvider implements IItemLabelProvider + { + private AdapterFactoryItemDelegator itemDelegator; + + public HierarchicalItemLabelProvider(AdapterFactoryItemDelegator itemDelegator) + { + this.itemDelegator = itemDelegator; + } + + public String getText(Object object) + { + StringBuilder builder = new StringBuilder(); + while (object != null && !(object instanceof Configuration)) + { + if (builder.length() != 0) + { + builder.insert(0, " - "); + } + + String text = itemDelegator.getText(object); + builder.insert(0, text); + + object = itemDelegator.getParent(object); + } + + return builder.toString(); + } + + public Object getImage(Object object) + { + return itemDelegator.getImage(object); + } + } +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java new file mode 100644 index 0000000000..6607cd115c --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/StringVariableTaskItemProvider.java @@ -0,0 +1,188 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.SetupPackage; +import org.eclipse.emf.cdo.releng.setup.StringVariableTask; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import org.eclipse.core.runtime.Path; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.StringVariableTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class StringVariableTaskItemProvider extends SetupTaskItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public StringVariableTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addNamePropertyDescriptor(object); + addValuePropertyDescriptor(object); + addDescriptionPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Name feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addNamePropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_StringVariableTask_name_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_StringVariableTask_name_feature", + "_UI_StringVariableTask_type"), SetupPackage.Literals.STRING_VARIABLE_TASK__NAME, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Value feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addValuePropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_StringVariableTask_value_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_StringVariableTask_value_feature", + "_UI_StringVariableTask_type"), SetupPackage.Literals.STRING_VARIABLE_TASK__VALUE, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Description feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDescriptionPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_StringVariableTask_description_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_StringVariableTask_description_feature", + "_UI_StringVariableTask_type"), SetupPackage.Literals.STRING_VARIABLE_TASK__DESCRIPTION, true, false, + false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This returns StringVariableTask.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/StringVariableTask")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + @Override + public String getText(Object object) + { + String name = ((StringVariableTask)object).getName(); + String value = ((StringVariableTask)object).getValue(); + + if (name != null && name.length() != 0) + { + name = new Path(name).lastSegment(); + } + else if (value == null || value.length() == 0) + { + return getString("_UI_StringVariableTask_type"); + } + + return "" + name + " = " + value; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(StringVariableTask.class)) + { + case SetupPackage.STRING_VARIABLE_TASK__NAME: + case SetupPackage.STRING_VARIABLE_TASK__VALUE: + case SetupPackage.STRING_VARIABLE_TASK__DESCRIPTION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java new file mode 100644 index 0000000000..8ee21dcebe --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/WorkingSetTaskItemProvider.java @@ -0,0 +1,156 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.SetupPackage; +import org.eclipse.emf.cdo.releng.setup.WorkingSetTask; +import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.releng.setup.WorkingSetTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class WorkingSetTaskItemProvider extends OneTimeSetupTaskItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource +{ + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public WorkingSetTaskItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) + { + if (childrenFeatures == null) + { + super.getChildrenFeatures(object); + childrenFeatures.add(SetupPackage.Literals.WORKING_SET_TASK__WORKING_SET_GROUP); + } + return childrenFeatures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) + { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** + * This returns WorkingSetTask.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/WorkingSetTask")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) + { + String label = ((WorkingSetTask)object).getId(); + return label == null || label.length() == 0 ? getString("_UI_WorkingSetTask_type") + : getString("_UI_WorkingSetTask_type") + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(WorkingSetTask.class)) + { + case SetupPackage.WORKING_SET_TASK__WORKING_SET_GROUP: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.WORKING_SET_TASK__WORKING_SET_GROUP, + WorkingSetsFactory.eINSTANCE.createWorkingSetGroup())); + } + +} |