diff options
| author | Eike Stepper | 2013-10-22 07:27:04 +0000 |
|---|---|---|
| committer | Eike Stepper | 2013-10-22 07:57:40 +0000 |
| commit | 739173c1b3a5b64a330cce45aa90f0bd0dbc23db (patch) | |
| tree | 030c51c19b03a7e5bdd30e5931bceae444773bb6 | |
| parent | 2f221ea05da6f9b8c0979ea19325f2c6cc1e8af2 (diff) | |
| download | cdo-739173c1b3a5b64a330cce45aa90f0bd0dbc23db.tar.gz cdo-739173c1b3a5b64a330cce45aa90f0bd0dbc23db.tar.xz cdo-739173c1b3a5b64a330cce45aa90f0bd0dbc23db.zip | |
Add KeyBindingTask
37 files changed, 2621 insertions, 339 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/icons/full/obj16/CommandParameter.gif b/plugins/org.eclipse.emf.cdo.releng.setup.edit/icons/full/obj16/CommandParameter.gif Binary files differnew file mode 100644 index 0000000000..39ba0d5159 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/icons/full/obj16/CommandParameter.gif diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/icons/full/obj16/KeyBindingTask.gif b/plugins/org.eclipse.emf.cdo.releng.setup.edit/icons/full/obj16/KeyBindingTask.gif Binary files differnew file mode 100644 index 0000000000..d289b194fb --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/icons/full/obj16/KeyBindingTask.gif diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties index a1a60dd606..4c3ead4a50 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties @@ -116,3 +116,19 @@ _UI_Trigger_BOOTSTRAP_literal = BOOTSTRAP _UI_Trigger_STARTUP_literal = STARTUP _UI_Trigger_MANUAL_literal = MANUAL _UI_WorkingSetTask_workingSets_feature = Working Sets +_UI_KeyBindingTask_type = Key Binding Task +_UI_KeyBindingTask_schemeID_feature = Scheme ID +_UI_KeyBindingTask_platform_feature = Platform +_UI_KeyBindingTask_contextID_feature = Context ID +_UI_KeyBindingTask_keySequence_feature = Key Sequence +_UI_KeyBindingTask_commandID_feature = Command ID +_UI_KeyBindingTask_locale_feature = Locale +_UI_KeyBindingTask_windowManager_feature = Window Manager +_UI_CommandParameter_type = Command Parameter +_UI_KeyBindingTask_scheme_feature = Scheme +_UI_KeyBindingTask_context_feature = Context +_UI_KeyBindingTask_keys_feature = Keys +_UI_KeyBindingTask_command_feature = Command +_UI_KeyBindingTask_commandParameters_feature = Command Parameters +_UI_CommandParameter_id_feature = Id +_UI_CommandParameter_value_feature = Value diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CommandParameterItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CommandParameterItemProvider.java new file mode 100644 index 0000000000..09c71c7046 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/CommandParameterItemProvider.java @@ -0,0 +1,183 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.CommandParameter; +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.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.CommandParameter} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class CommandParameterItemProvider 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 CommandParameterItemProvider(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); + addValuePropertyDescriptor(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_CommandParameter_id_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_CommandParameter_id_feature", + "_UI_CommandParameter_type"), SetupPackage.Literals.COMMAND_PARAMETER__ID, 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_CommandParameter_value_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_CommandParameter_value_feature", + "_UI_CommandParameter_type"), SetupPackage.Literals.COMMAND_PARAMETER__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 CommandParameter.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/CommandParameter")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + @Override + public String getText(Object object) + { + CommandParameter commandParameter = (CommandParameter)object; + return "" + commandParameter.getId() + " = " + commandParameter.getValue(); + } + + /** + * 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(CommandParameter.class)) + { + case SetupPackage.COMMAND_PARAMETER__ID: + case SetupPackage.COMMAND_PARAMETER__VALUE: + 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(); + } + +} 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 index 79601cad8d..8d966cfcf1 100644 --- 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 @@ -215,6 +215,9 @@ public class CompoundSetupTaskItemProvider extends SetupTaskItemProvider impleme newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, SetupFactory.eINSTANCE.createTextModifyTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createKeyBindingTask())); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/KeyBindingTaskItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/KeyBindingTaskItemProvider.java new file mode 100644 index 0000000000..940f18bbe7 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/KeyBindingTaskItemProvider.java @@ -0,0 +1,276 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.provider; + +import org.eclipse.emf.cdo.releng.setup.KeyBindingTask; +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.KeyBindingTask} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class KeyBindingTaskItemProvider 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 KeyBindingTaskItemProvider(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); + + addSchemePropertyDescriptor(object); + addContextPropertyDescriptor(object); + addPlatformPropertyDescriptor(object); + addLocalePropertyDescriptor(object); + addKeysPropertyDescriptor(object); + addCommandPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Scheme feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addSchemePropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_KeyBindingTask_scheme_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_KeyBindingTask_scheme_feature", + "_UI_KeyBindingTask_type"), SetupPackage.Literals.KEY_BINDING_TASK__SCHEME, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Context feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addContextPropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_KeyBindingTask_context_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_KeyBindingTask_context_feature", + "_UI_KeyBindingTask_type"), SetupPackage.Literals.KEY_BINDING_TASK__CONTEXT, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Platform feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addPlatformPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_KeyBindingTask_platform_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_KeyBindingTask_platform_feature", + "_UI_KeyBindingTask_type"), SetupPackage.Literals.KEY_BINDING_TASK__PLATFORM, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Locale feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addLocalePropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_KeyBindingTask_locale_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_KeyBindingTask_locale_feature", + "_UI_KeyBindingTask_type"), SetupPackage.Literals.KEY_BINDING_TASK__LOCALE, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This adds a property descriptor for the Keys feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addKeysPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_KeyBindingTask_keys_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_KeyBindingTask_keys_feature", "_UI_KeyBindingTask_type"), + SetupPackage.Literals.KEY_BINDING_TASK__KEYS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, null)); + } + + /** + * This adds a property descriptor for the Command feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addCommandPropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_KeyBindingTask_command_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_KeyBindingTask_command_feature", + "_UI_KeyBindingTask_type"), SetupPackage.Literals.KEY_BINDING_TASK__COMMAND, 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.KEY_BINDING_TASK__COMMAND_PARAMETERS); + } + 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 KeyBindingTask.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/KeyBindingTask")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + @Override + public String getText(Object object) + { + KeyBindingTask keyBindingTask = (KeyBindingTask)object; + return "" + keyBindingTask.getKeys() + " --> " + keyBindingTask.getCommand(); + } + + /** + * 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(KeyBindingTask.class)) + { + case SetupPackage.KEY_BINDING_TASK__SCHEME: + case SetupPackage.KEY_BINDING_TASK__CONTEXT: + case SetupPackage.KEY_BINDING_TASK__PLATFORM: + case SetupPackage.KEY_BINDING_TASK__LOCALE: + case SetupPackage.KEY_BINDING_TASK__KEYS: + case SetupPackage.KEY_BINDING_TASK__COMMAND: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case SetupPackage.KEY_BINDING_TASK__COMMAND_PARAMETERS: + 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.KEY_BINDING_TASK__COMMAND_PARAMETERS, + SetupFactory.eINSTANCE.createCommandParameter())); + } + +} 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 ff8b513a6f..693b7bd2cf 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 @@ -447,9 +447,59 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme } /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected KeyBindingTaskItemProvider keyBindingTaskItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createKeyBindingTaskAdapter() + { + if (keyBindingTaskItemProvider == null) + { + keyBindingTaskItemProvider = new KeyBindingTaskItemProvider(this); + } + + return keyBindingTaskItemProvider; + } + + /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.releng.setup.CommandParameter} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected CommandParameterItemProvider commandParameterItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.cdo.releng.setup.CommandParameter}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createCommandParameterAdapter() + { + if (commandParameterItemProvider == null) + { + commandParameterItemProvider = new CommandParameterItemProvider(this); + } + + return commandParameterItemProvider; + } + + /** * 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 --> + * <!-- end-user-doc --> * @generated */ protected EclipseIniTaskItemProvider eclipseIniTaskItemProvider; @@ -804,6 +854,10 @@ public class SetupItemProviderAdapterFactory extends SetupAdapterFactory impleme textModifyTaskItemProvider.dispose(); if (textModificationItemProvider != null) textModificationItemProvider.dispose(); + if (keyBindingTaskItemProvider != null) + keyBindingTaskItemProvider.dispose(); + if (commandParameterItemProvider != null) + commandParameterItemProvider.dispose(); } } diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java index ff94afb027..b0a10d3870 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/SetupTaskContainerItemProvider.java @@ -192,6 +192,9 @@ public class SetupTaskContainerItemProvider extends ItemProviderAdapter implemen newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, SetupFactory.eINSTANCE.createTextModifyTask())); + + newChildDescriptors.add(createChildParameter(SetupPackage.Literals.SETUP_TASK_CONTAINER__SETUP_TASKS, + SetupFactory.eINSTANCE.createKeyBindingTask())); } /** diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java index f39153c097..a1a581e364 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor/src/org/eclipse/emf/cdo/releng/setup/presentation/actions/ManualPerformAction.java @@ -51,6 +51,21 @@ public class ManualPerformAction implements IWorkbenchWindowActionDelegate try { final SetupTaskPerformer setupTaskPerformer = new SetupTaskPerformer(true); + + // if (true) + // { + // KeyBindingTask task = SetupFactory.eINSTANCE.createKeyBindingTask(); + // task.setKeys("F12"); + // task.setCommand("org.eclipse.emf.cdo.releng.OpenManifest"); + // + // if (task.isNeeded(setupTaskPerformer)) + // { + // task.perform(setupTaskPerformer); + // } + // + // return; + // } + File logFile = new File(setupTaskPerformer.getInstallDir(), "setup.log"); IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0]; final Shell shell = window.getShell(); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF index b1722d1fc2..c8145eee02 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF @@ -8,33 +8,33 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.emf.cdo.releng.workingsets;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.releng.predicates;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.releng.workingsets;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", + org.eclipse.emf.cdo.releng.predicates;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", + org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.5.0,3.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)", - org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional, - org.eclipse.core.variables;bundle-version="[3.0.0,4.0.0)";resolution:=optional, - org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)";resolution:=optional, - org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)";resolution:=optional, - org.eclipse.team.ui;bundle-version="[3.5.0,4.0.0)";resolution:=optional, - javaewah;bundle-version="[0.0.0,1.0.0)";resolution:=optional, - org.eclipse.jgit;bundle-version="[3.0.0,4.0.0)";resolution:=optional, - org.eclipse.egit;bundle-version="[3.0.0,4.0.0)";resolution:=optional, - org.eclipse.egit.core;bundle-version="[3.0.0,4.0.0)";resolution:=optional, - org.eclipse.egit.ui;bundle-version="[3.0.0,4.0.0)";resolution:=optional, - org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";resolution:=optional, - org.eclipse.ecf.provider.filetransfer;bundle-version="[3.2.0,4.0.0)";resolution:=optional, - org.eclipse.ecf.filetransfer;bundle-version="[5.0.0,6.0.0)";resolution:=optional, - org.eclipse.ecf.identity;bundle-version="[3.2.0,4.0.0)";resolution:=optional, - org.eclipse.ecf;bundle-version="[3.2.0,4.0.0)";resolution:=optional, - org.eclipse.buckminster.sax;bundle-version="[1.0.0,2.0.0)";resolution:=optional, - org.eclipse.buckminster.cmdline;bundle-version="[1.0.0,2.0.0)";resolution:=optional, - org.eclipse.buckminster.download;bundle-version="[1.0.0,2.0.0)";resolution:=optional, - org.eclipse.buckminster.runtime;bundle-version="[1.0.0,2.0.0)";resolution:=optional, - org.eclipse.buckminster.core;bundle-version="[1.0.0,2.0.0)";resolution:=optional, - org.eclipse.buckminster.pde;bundle-version="[1.0.0,2.0.0)";resolution:=optional, + org.eclipse.core.resources;resolution:=optional;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.variables;resolution:=optional;bundle-version="[3.0.0,4.0.0)", + org.eclipse.pde.core;resolution:=optional;bundle-version="[3.5.0,4.0.0)", + org.eclipse.pde.api.tools;resolution:=optional;bundle-version="[1.0.0,2.0.0)", + org.eclipse.team.ui;resolution:=optional;bundle-version="[3.5.0,4.0.0)", + javaewah;resolution:=optional;bundle-version="[0.0.0,1.0.0)", + org.eclipse.jgit;resolution:=optional;bundle-version="[3.0.0,4.0.0)", + org.eclipse.egit;resolution:=optional;bundle-version="[3.0.0,4.0.0)", + org.eclipse.egit.core;resolution:=optional;bundle-version="[3.0.0,4.0.0)", + org.eclipse.egit.ui;resolution:=optional;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.edit.ui;resolution:=optional;bundle-version="[2.5.0,3.0.0)", + org.eclipse.ecf.provider.filetransfer;resolution:=optional;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ecf.filetransfer;resolution:=optional;bundle-version="[5.0.0,6.0.0)", + org.eclipse.ecf.identity;resolution:=optional;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ecf;resolution:=optional;bundle-version="[3.2.0,4.0.0)", + org.eclipse.buckminster.sax;resolution:=optional;bundle-version="[1.0.0,2.0.0)", + org.eclipse.buckminster.cmdline;resolution:=optional;bundle-version="[1.0.0,2.0.0)", + org.eclipse.buckminster.download;resolution:=optional;bundle-version="[1.0.0,2.0.0)", + org.eclipse.buckminster.runtime;resolution:=optional;bundle-version="[1.0.0,2.0.0)", + org.eclipse.buckminster.core;resolution:=optional;bundle-version="[1.0.0,2.0.0)", + org.eclipse.buckminster.pde;resolution:=optional;bundle-version="[1.0.0,2.0.0)", org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)", - org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)";resolution:=optional, + org.eclipse.equinox.p2.ui;resolution:=optional;bundle-version="[2.0.0,3.0.0)", org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)", org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)", org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.0,2.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore index 7bbd146d6f..23b00e7232 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore +++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore @@ -122,15 +122,6 @@ eType="ecore:EClass ../../org.eclipse.emf.cdo.releng.workingsets/model/workingsets.ecore#//WorkingSet" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EEnum" name="SetupTaskScope"> - <eLiterals name="None"/> - <eLiterals name="Configuration" value="1"/> - <eLiterals name="Project" value="2"/> - <eLiterals name="Branch" value="3"/> - <eLiterals name="User" value="4"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/> - <eClassifiers xsi:type="ecore:EDataType" name="Exception" instanceClassName="java.lang.Exception"/> <eClassifiers xsi:type="ecore:EClass" name="ResourceCopyTask" eSuperTypes="#//SetupTask"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -145,10 +136,35 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="substitutions" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EDataType" name="TriggerSet" instanceTypeName="java.util.Set<org.eclipse.emf.cdo.releng.setup.Trigger>"/> + <eClassifiers xsi:type="ecore:EClass" name="KeyBindingTask" eSuperTypes="#//SetupTask"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="scheme" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" + defaultValueLiteral="org.eclipse.ui.defaultAcceleratorConfiguration"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="context" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" + defaultValueLiteral="org.eclipse.ui.contexts.window"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="platform" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="locale" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="keys" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="command" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="commandParameters" upperBound="-1" + eType="#//CommandParameter" containment="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="CommandParameter"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EEnum" name="SetupTaskScope"> + <eLiterals name="None"/> + <eLiterals name="Configuration" value="1"/> + <eLiterals name="Project" value="2"/> + <eLiterals name="Branch" value="3"/> + <eLiterals name="User" value="4"/> + </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="Trigger"> <eLiterals name="BOOTSTRAP"/> <eLiterals name="STARTUP" value="1"/> <eLiterals name="MANUAL" value="2"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="TriggerSet" instanceTypeName="java.util.Set<org.eclipse.emf.cdo.releng.setup.Trigger>"/> + <eClassifiers xsi:type="ecore:EDataType" name="Exception" instanceClassName="java.lang.Exception"/> + <eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/> </ecore:EPackage> diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag index 17b2af6281..fca3763123 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag +++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag @@ -14,7 +14,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_zoytIeoIEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13420443" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//Configuration"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zoytIuoIEeKpRf481yfX-g" x="190" y="348" width="127"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zoytIuoIEeKpRf481yfX-g" x="330" y="368" width="127"/> </children> <children xmi:type="notation:Node" xmi:id="_2Y42MOoIEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_2Y5dQOoIEeKpRf481yfX-g" type="4001"/> @@ -34,7 +34,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_2Y42MeoIEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13420443" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//Project"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Y42MuoIEeKpRf481yfX-g" x="458" y="344"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Y42MuoIEeKpRf481yfX-g" x="598" y="364"/> </children> <children xmi:type="notation:Node" xmi:id="_3TdBAOoIEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_3TdoEOoIEeKpRf481yfX-g" type="4001"/> @@ -54,7 +54,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_3TdBAeoIEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13420443" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//Branch"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3TdBAuoIEeKpRf481yfX-g" x="716" y="344"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3TdBAuoIEeKpRf481yfX-g" x="856" y="364"/> </children> <children xmi:type="notation:Node" xmi:id="_RhEkcOoJEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_RhFLgeoJEeKpRf481yfX-g" type="4001"/> @@ -70,7 +70,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_RhEkceoJEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//SetupTaskContainer"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RhFLgOoJEeKpRf481yfX-g" x="675" y="15" width="158"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RhFLgOoJEeKpRf481yfX-g" x="815" y="75" width="158"/> </children> <children xmi:type="notation:Node" xmi:id="_678VMOoJEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_6788QOoJEeKpRf481yfX-g" type="4001"/> @@ -90,7 +90,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_678VMeoJEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13420443" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//EclipseVersion"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_678VMuoJEeKpRf481yfX-g" x="165" y="477" width="178" height="68"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_678VMuoJEeKpRf481yfX-g" x="20" y="365" width="178" height="68"/> </children> <children xmi:type="notation:Node" xmi:id="_PhLMcOoNEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_PhLzgOoNEeKpRf481yfX-g" type="4001"/> @@ -106,7 +106,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_PhLMceoNEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//P2Task"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PhLMcuoNEeKpRf481yfX-g" x="194" y="783" width="118" height="43"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PhLMcuoNEeKpRf481yfX-g" x="385" y="605" width="118" height="43"/> </children> <children xmi:type="notation:Node" xmi:id="_mgNekOoOEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_mgOFoOoOEeKpRf481yfX-g" type="4001"/> @@ -126,7 +126,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_mgNekeoOEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//InstallableUnit"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgNekuoOEeKpRf481yfX-g" x="60" y="895" width="121"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgNekuoOEeKpRf481yfX-g" x="305" y="720" width="121"/> </children> <children xmi:type="notation:Node" xmi:id="_q3yi0OoOEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_q3zJ4OoOEeKpRf481yfX-g" type="4001"/> @@ -146,7 +146,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_q3yi0eoOEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//P2Repository"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3yi0uoOEeKpRf481yfX-g" x="330" y="895"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3yi0uoOEeKpRf481yfX-g" x="465" y="720"/> </children> <children xmi:type="notation:Node" xmi:id="_62v54OoOEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_62wg8OoOEeKpRf481yfX-g" type="4001"/> @@ -170,7 +170,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_62v54eoOEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//ApiBaselineTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_62v54uoOEeKpRf481yfX-g" x="975" y="915"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_62v54uoOEeKpRf481yfX-g" x="1040" y="720"/> </children> <children xmi:type="notation:Node" xmi:id="_bOTg8OoYEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_bOUIAOoYEeKpRf481yfX-g" type="4001"/> @@ -198,7 +198,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_bOTg8eoYEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13420443" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//Preferences"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bOTg8uoYEeKpRf481yfX-g" x="984" y="213"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bOTg8uoYEeKpRf481yfX-g" x="1025" y="370"/> </children> <children xmi:type="notation:Node" xmi:id="_tV-Q8OoYEeKpRf481yfX-g" type="1001"> <children xmi:type="notation:Node" xmi:id="_tV_fEOoYEeKpRf481yfX-g" type="4001"/> @@ -218,7 +218,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_tV-4AOoYEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13420443" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//Setup"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tV-4AeoYEeKpRf481yfX-g" x="621" y="485"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tV-4AeoYEeKpRf481yfX-g" x="761" y="505"/> </children> <children xmi:type="notation:Node" xmi:id="_LJQ64PTrEeKROP7mUifaFQ" type="1001"> <children xmi:type="notation:Node" xmi:id="_LJXBgPTrEeKROP7mUifaFQ" type="4001"/> @@ -242,7 +242,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_LJQ64fTrEeKROP7mUifaFQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//EclipsePreferenceTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LJQ64vTrEeKROP7mUifaFQ" x="735" y="945" width="164"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LJQ64vTrEeKROP7mUifaFQ" x="250" y="960" width="164"/> </children> <children xmi:type="notation:Node" xmi:id="_iK-h0PdCEeKAgoQldAmgzQ" type="1001"> <children xmi:type="notation:Node" xmi:id="_iK-h0_dCEeKAgoQldAmgzQ" type="4001"/> @@ -266,7 +266,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_iK-h0fdCEeKAgoQldAmgzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//LinkLocationTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iK-h0vdCEeKAgoQldAmgzQ" x="410" y="783" width="138"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iK-h0vdCEeKAgoQldAmgzQ" x="455" y="955" width="138"/> </children> <children xmi:type="notation:Node" xmi:id="_7oaMoAVzEeORNPhE9cWxTA" type="1001"> <children xmi:type="notation:Node" xmi:id="_7oco4AVzEeORNPhE9cWxTA" type="4001"/> @@ -302,7 +302,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_7oaMoQVzEeORNPhE9cWxTA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//SetupTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7oaMogVzEeORNPhE9cWxTA" x="240" width="303" height="153"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7oaMogVzEeORNPhE9cWxTA" x="135" y="35" width="238" height="123"/> </children> <children xmi:type="notation:Node" xmi:id="_JIhT8AV6EeORNPhE9cWxTA" type="1001"> <children xmi:type="notation:Node" xmi:id="_JIiiEAV6EeORNPhE9cWxTA" type="4001"/> @@ -318,7 +318,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_JIhT8QV6EeORNPhE9cWxTA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//WorkingSetTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JIhT8gV6EeORNPhE9cWxTA" x="925" y="701" width="127"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JIhT8gV6EeORNPhE9cWxTA" x="645" y="605" width="127"/> </children> <children xmi:type="notation:Node" xmi:id="_-8kV8AV8EeORNPhE9cWxTA" type="1001"> <children xmi:type="notation:Node" xmi:id="_-8nZQAV8EeORNPhE9cWxTA" type="4001"/> @@ -338,7 +338,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_-8k9AAV8EeORNPhE9cWxTA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//CompoundSetupTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-8k9AQV8EeORNPhE9cWxTA" x="390" y="180" width="171"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-8k9AQV8EeORNPhE9cWxTA" x="820" y="250" width="171"/> </children> <children xmi:type="notation:Node" xmi:id="__XTX4AWBEeORNPhE9cWxTA" type="1001"> <children xmi:type="notation:Node" xmi:id="__XdI4AWBEeORNPhE9cWxTA" type="4001"/> @@ -354,7 +354,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="__XTX4QWBEeORNPhE9cWxTA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13420443" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//ConfigurableItem"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="__XTX4gWBEeORNPhE9cWxTA" x="615" y="240"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__XTX4gWBEeORNPhE9cWxTA" x="450" y="250"/> </children> <children xmi:type="notation:Node" xmi:id="_V2XO0AWWEeOw6Pg8FrULkw" type="1001"> <children xmi:type="notation:Node" xmi:id="_V2aSIAWWEeOw6Pg8FrULkw" type="4001"/> @@ -382,7 +382,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_V2XO0QWWEeOw6Pg8FrULkw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//BuckminsterImportTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V2XO0gWWEeOw6Pg8FrULkw" x="713" y="680" width="173"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V2XO0gWWEeOw6Pg8FrULkw" x="240" y="835" width="173"/> </children> <children xmi:type="notation:Node" xmi:id="_QeGy0AZpEeO9d-kMVrgNew" type="1001"> <children xmi:type="notation:Node" xmi:id="_QeJ2IAZpEeO9d-kMVrgNew" type="4001"/> @@ -398,7 +398,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_QeHZ4AZpEeO9d-kMVrgNew" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//GitCloneTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QeHZ4QZpEeO9d-kMVrgNew" x="495" y="960"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QeHZ4QZpEeO9d-kMVrgNew" x="445" y="835"/> </children> <children xmi:type="notation:Node" xmi:id="_epPbkAcIEeOppfhSm9mbUA" type="1001"> <children xmi:type="notation:Node" xmi:id="_epPbkwcIEeOppfhSm9mbUA" type="4001"/> @@ -426,7 +426,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_epPbkQcIEeOppfhSm9mbUA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//StringVariableTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epPbkgcIEeOppfhSm9mbUA" x="720" y="810" width="167"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epPbkgcIEeOppfhSm9mbUA" x="650" y="835" width="167"/> </children> <children xmi:type="notation:Node" xmi:id="_FOcX8AfTEeOppfhSm9mbUA" type="1005"> <children xmi:type="notation:Node" xmi:id="_FOcX8wfTEeOppfhSm9mbUA" type="4010"/> @@ -457,7 +457,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_FOcX8QfTEeOppfhSm9mbUA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EEnum" href="setup.ecore#//SetupTaskScope"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FOcX8gfTEeOppfhSm9mbUA" x="20" y="20" width="163" height="193"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FOcX8gfTEeOppfhSm9mbUA" x="50" y="590" width="148" height="138"/> </children> <children xmi:type="notation:Node" xmi:id="_s1eHUAflEeOppfhSm9mbUA" type="1001"> <children xmi:type="notation:Node" xmi:id="_s1eHUwflEeOppfhSm9mbUA" type="4001"/> @@ -485,7 +485,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_s1eHUQflEeOppfhSm9mbUA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//EclipseIniTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s1eHUgflEeOppfhSm9mbUA" x="570" y="783" width="130"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s1eHUgflEeOppfhSm9mbUA" x="850" y="840" width="130"/> </children> <children xmi:type="notation:Node" xmi:id="_aSLB8AmrEeOuXPWwsMY9fA" type="1001"> <children xmi:type="notation:Node" xmi:id="_aSMQEAmrEeOuXPWwsMY9fA" type="4001"/> @@ -501,7 +501,7 @@ </children> <styles xmi:type="notation:ShapeStyle" xmi:id="_aSLB8QmrEeOuXPWwsMY9fA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//OneTimeSetupTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aSLB8gmrEeOuXPWwsMY9fA" x="835" y="580"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aSLB8gmrEeOuXPWwsMY9fA" x="1055" y="605"/> </children> <children xmi:type="notation:Node" xmi:id="_QJaZUDWJEeO0we5dUm5hxw" type="1001"> <children xmi:type="notation:Node" xmi:id="_QJbncDWJEeO0we5dUm5hxw" type="4001"/> @@ -523,9 +523,9 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_QJbndzWJEeO0we5dUm5hxw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QJbneDWJEeO0we5dUm5hxw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_QJaZUTWJEeO0we5dUm5hxw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_QJaZUTWJEeO0we5dUm5hxw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//ResourceCopyTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QJaZUjWJEeO0we5dUm5hxw" x="1170" y="525"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QJaZUjWJEeO0we5dUm5hxw" x="1040" y="840"/> </children> <children xmi:type="notation:Node" xmi:id="_am8vMDWJEeO0we5dUm5hxw" type="1001"> <children xmi:type="notation:Node" xmi:id="_am8vMzWJEeO0we5dUm5hxw" type="4001"/> @@ -543,9 +543,9 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_am9WRjWJEeO0we5dUm5hxw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_am9WRzWJEeO0we5dUm5hxw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_am8vMTWJEeO0we5dUm5hxw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_am8vMTWJEeO0we5dUm5hxw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//TextModifyTask"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_am8vMjWJEeO0we5dUm5hxw" x="1215" y="645"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_am8vMjWJEeO0we5dUm5hxw" x="860" y="605"/> </children> <children xmi:type="notation:Node" xmi:id="_erZCwDWOEeO0we5dUm5hxw" type="1001"> <children xmi:type="notation:Node" xmi:id="_erZCwzWOEeO0we5dUm5hxw" type="4001"/> @@ -567,16 +567,16 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_erZp1jWOEeO0we5dUm5hxw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_erZp1zWOEeO0we5dUm5hxw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_erZCwTWOEeO0we5dUm5hxw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_erZCwTWOEeO0we5dUm5hxw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="setup.ecore#//TextModification"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_erZCwjWOEeO0we5dUm5hxw" x="1200" y="765"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_erZCwjWOEeO0we5dUm5hxw" x="835" y="710"/> </children> <children xmi:type="notation:Node" xmi:id="_3NJlQDYmEeO8Ub-p5y_fsQ" type="1004"> <children xmi:type="notation:Node" xmi:id="_3NMokDYmEeO8Ub-p5y_fsQ" type="4008"/> <children xmi:type="notation:Node" xmi:id="_3NN2sDYmEeO8Ub-p5y_fsQ" type="4009"/> - <styles xmi:type="notation:ShapeStyle" xmi:id="_3NKMUDYmEeO8Ub-p5y_fsQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_3NKMUDYmEeO8Ub-p5y_fsQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EDataType" href="setup.ecore#//TriggerSet"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3NKMUTYmEeO8Ub-p5y_fsQ" x="1260" y="180"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3NKMUTYmEeO8Ub-p5y_fsQ" x="40" y="755" width="168"/> </children> <children xmi:type="notation:Node" xmi:id="_KMEtYDYnEeO8Ub-p5y_fsQ" type="1005"> <children xmi:type="notation:Node" xmi:id="_KMFUcDYnEeO8Ub-p5y_fsQ" type="4010"/> @@ -597,9 +597,9 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_KMF7gjYnEeO8Ub-p5y_fsQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_KMF7gzYnEeO8Ub-p5y_fsQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_KMEtYTYnEeO8Ub-p5y_fsQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_KMEtYTYnEeO8Ub-p5y_fsQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EEnum" href="setup.ecore#//Trigger"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KMEtYjYnEeO8Ub-p5y_fsQ" x="1453" y="316"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KMEtYjYnEeO8Ub-p5y_fsQ" x="70" y="830"/> </children> <children xmi:type="notation:Node" xmi:id="_1NjhoDcOEeOvrbVwd-Y02g" type="1001"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1OvNYDcOEeOvrbVwd-Y02g" source="Shortcut"> @@ -616,9 +616,41 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_1NsEgjcOEeOvrbVwd-Y02g"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_1NsEgzcOEeOvrbVwd-Y02g"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_1NjhoTcOEeOvrbVwd-Y02g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_1NjhoTcOEeOvrbVwd-Y02g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.cdo.releng.workingsets/model/workingsets.ecore#//WorkingSet"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1NjhojcOEeOvrbVwd-Y02g" x="975" y="795"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1NjhojcOEeOvrbVwd-Y02g" x="655" y="700"/> + </children> + <children xmi:type="notation:Node" xmi:id="_cRNVkDo_EeOm3ZfER1Sl2A" type="1001"> + <children xmi:type="notation:Node" xmi:id="_cRQY4Do_EeOm3ZfER1Sl2A" type="4001"/> + <children xmi:type="notation:Node" xmi:id="_cRRnADo_EeOm3ZfER1Sl2A" type="5001"> + <styles xmi:type="notation:DrawerStyle" xmi:id="_cRRnATo_EeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_cRRnAjo_EeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_cRRnAzo_EeOm3ZfER1Sl2A"/> + </children> + <children xmi:type="notation:Node" xmi:id="_cRS1IDo_EeOm3ZfER1Sl2A" type="5002"> + <styles xmi:type="notation:DrawerStyle" xmi:id="_cRS1ITo_EeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_cRS1Ijo_EeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_cRS1Izo_EeOm3ZfER1Sl2A"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_cRNVkTo_EeOm3ZfER1Sl2A" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="15053796" lineColor="8421504"/> + <element xmi:type="ecore:EClass" href="setup.ecore#//KeyBindingTask"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cRNVkjo_EeOm3ZfER1Sl2A" x="650" y="955" width="193"/> + </children> + <children xmi:type="notation:Node" xmi:id="_zKlSEDrkEeOm3ZfER1Sl2A" type="1001"> + <children xmi:type="notation:Node" xmi:id="_zKqKkDrkEeOm3ZfER1Sl2A" type="4001"/> + <children xmi:type="notation:Node" xmi:id="_zKqKkTrkEeOm3ZfER1Sl2A" type="5001"> + <styles xmi:type="notation:DrawerStyle" xmi:id="_zKqKkjrkEeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_zKqKkzrkEeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_zKqKlDrkEeOm3ZfER1Sl2A"/> + </children> + <children xmi:type="notation:Node" xmi:id="_zKqKlTrkEeOm3ZfER1Sl2A" type="5002"> + <styles xmi:type="notation:DrawerStyle" xmi:id="_zKqKljrkEeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_zKqKlzrkEeOm3ZfER1Sl2A"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_zKqKmDrkEeOm3ZfER1Sl2A"/> + </children> + <styles xmi:type="notation:ShapeStyle" xmi:id="_zKlSETrkEeOm3ZfER1Sl2A" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/> + <element xmi:type="ecore:EClass" href="setup.ecore#//CommandParameter"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKlSEjrkEeOm3ZfER1Sl2A" x="675" y="1175"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_u_e_seoIEeKpRf481yfX-g"/> <element xmi:type="ecore:EPackage" href="setup.ecore#/"/> @@ -654,17 +686,17 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_TwgQceoJEeKpRf481yfX-g" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_TwgQcuoJEeKpRf481yfX-g" fontName="Segoe UI"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TwgQc-oJEeKpRf481yfX-g" points="[6, -30, -155, 81]$[6, -59, -155, 52]$[159, -59, -2, 52]$[159, -87, -2, 24]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TwgQc-oJEeKpRf481yfX-g" points="[1, -24, 146, 94]$[1, -62, 146, 56]$[-144, -62, 1, 56]$[-144, -97, 1, 21]"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_U3twIOoJEeKpRf481yfX-g" type="3003" source="_3TdBAOoIEeKpRf481yfX-g" target="__XTX4AWBEeORNPhE9cWxTA"> <styles xmi:type="notation:ConnectorStyle" xmi:id="_U3twIeoJEeKpRf481yfX-g" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_U3twIuoJEeKpRf481yfX-g" fontName="Segoe UI"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U3twI-oJEeKpRf481yfX-g" points="[21, -30, 118, 81]$[21, -59, 118, 52]$[-99, -59, -2, 52]$[-99, -87, -2, 24]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U3twI-oJEeKpRf481yfX-g" points="[-2, -24, 401, 94]$[-2, -62, 401, 56]$[-402, -62, 1, 56]$[-402, -97, 1, 21]"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_s_VTkOoNEeKpRf481yfX-g" type="3002" source="_zoytIOoIEeKpRf481yfX-g" target="_678VMOoJEeKpRf481yfX-g"> <children xmi:type="notation:Node" xmi:id="_s_V6oOoNEeKpRf481yfX-g" type="4011"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_s_V6oeoNEeKpRf481yfX-g" x="2" y="49"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_s_V6oeoNEeKpRf481yfX-g" x="-34" y="12"/> </children> <children xmi:type="notation:Node" xmi:id="_s_V6ouoNEeKpRf481yfX-g" type="4012"> <layoutConstraint xmi:type="notation:Location" xmi:id="_s_V6o-oNEeKpRf481yfX-g" x="3" y="-21"/> @@ -672,7 +704,7 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_s_VTkeoNEeKpRf481yfX-g" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_s_VTkuoNEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//Configuration/eclipseVersions"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s_VTk-oNEeKpRf481yfX-g" points="[7, 21, 6, -121]$[7, 109, 6, -33]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s_VTk-oNEeKpRf481yfX-g" points="[-62, 2, 187, -8]$[-161, 2, 88, -8]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8U3-UAWlEeOw6Pg8FrULkw" id="(0.5,0.5)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8U3-UQWlEeOw6Pg8FrULkw" id="(0.5,0.5)"/> </edges> @@ -714,7 +746,7 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_0pBn0eoYEeKpRf481yfX-g" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_0pBn0uoYEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//Setup/branch"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pBn0-oYEeKpRf481yfX-g" points="[38, -10, 9, 134]$[38, -77, 9, 67]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0pBn0-oYEeKpRf481yfX-g" points="[32, -10, -1, 136]$[32, -102, -1, 44]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pEEEOoYEeKpRf481yfX-g" id="(0.4019607843137255,0.20930232558139536)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0pEEEeoYEeKpRf481yfX-g" id="(0.4931506849315068,0.10588235294117647)"/> </edges> @@ -728,20 +760,20 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_uVxboerJEeKpRf481yfX-g" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_uVxbourJEeKpRf481yfX-g" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//Setup/eclipseVersion"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uVxbo-rJEeKpRf481yfX-g" points="[-151, -6, 420, 16]$[-475, -6, 96, 16]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uVxbo-rJEeKpRf481yfX-g" points="[-146, 1, 626, 155]$[-767, 1, 5, 155]$[-767, -98, 5, 56]"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uV5-gOrJEeKpRf481yfX-g" id="(0.4550561797752809,0.16176470588235295)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_rDKrIO0pEeKeBJzrXkhCcg" type="3002" source="_tV-Q8OoYEeKpRf481yfX-g" target="_bOTg8OoYEeKpRf481yfX-g"> <children xmi:type="notation:Node" xmi:id="_rDNucO0pEeKeBJzrXkhCcg" type="4011"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rDNuce0pEeKeBJzrXkhCcg" x="30" y="41"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rDNuce0pEeKeBJzrXkhCcg" x="7" y="39"/> </children> <children xmi:type="notation:Node" xmi:id="_rDOVgO0pEeKeBJzrXkhCcg" type="4012"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_rDOVge0pEeKeBJzrXkhCcg" x="30" y="-12"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rDOVge0pEeKeBJzrXkhCcg" x="4" y="-16"/> </children> <styles xmi:type="notation:ConnectorStyle" xmi:id="_rDKrIe0pEeKeBJzrXkhCcg" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_rDKrIu0pEeKeBJzrXkhCcg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//Setup/preferences"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rDKrI-0pEeKeBJzrXkhCcg" points="[152, 3, -91, 258]$[243, 3, 0, 258]$[243, -213, 0, 42]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rDKrI-0pEeKeBJzrXkhCcg" points="[146, 1, -47, 119]$[198, 1, 5, 119]$[198, -76, 5, 42]"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_ETHrAPKREeK108x_FqyAbw" type="3002" source="_3TdBAOoIEeKpRf481yfX-g" target="_2Y42MOoIEeKpRf481yfX-g"> <children xmi:type="notation:Node" xmi:id="_ETRcAPKREeK108x_FqyAbw" type="4011"> @@ -773,7 +805,7 @@ </edges> <edges xmi:type="notation:Edge" xmi:id="_Nhv9wPKREeK108x_FqyAbw" type="3002" source="_678VMOoJEeKpRf481yfX-g" target="_zoytIOoIEeKpRf481yfX-g"> <children xmi:type="notation:Node" xmi:id="_Nhv9xPKREeK108x_FqyAbw" type="4011"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_Nhv9xfKREeK108x_FqyAbw" x="-3" y="-44"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Nhv9xfKREeK108x_FqyAbw" x="-36" y="18"/> </children> <children xmi:type="notation:Node" xmi:id="_Nhv9xvKREeK108x_FqyAbw" type="4012"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Nhv9x_KREeK108x_FqyAbw" x="-3" y="17"/> @@ -781,9 +813,9 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_Nhv9wfKREeK108x_FqyAbw" routing="Rectilinear" closestDistance="true" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_Nhv9wvKREeK108x_FqyAbw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//EclipseVersion/configuration"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nhv9w_KREeK108x_FqyAbw" points="[6, -33, 7, 109]$[6, -121, 7, 21]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vBlxpPKREeK108x_FqyAbw" id="(0.5,0.5)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vBlxpfKREeK108x_FqyAbw" id="(0.5,0.5)"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nhv9w_KREeK108x_FqyAbw" points="[88, -8, -161, 2]$[187, -8, -62, 2]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHVgwDo_EeOm3ZfER1Sl2A" id="(0.5,0.5)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHVgwTo_EeOm3ZfER1Sl2A" id="(0.5,0.5)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_QQajcPKREeK108x_FqyAbw" type="3002" source="_mgNekOoOEeKpRf481yfX-g" target="_PhLMcOoNEeKpRf481yfX-g"> <children xmi:type="notation:Node" xmi:id="_QQajdPKREeK108x_FqyAbw" type="4011"> @@ -820,17 +852,17 @@ <children xmi:type="notation:Node" xmi:id="_TTmfFvTrEeKROP7mUifaFQ" type="4012"> <layoutConstraint xmi:type="notation:Location" xmi:id="_TTmfF_TrEeKROP7mUifaFQ" x="-24" y="26"/> </children> - <styles xmi:type="notation:ConnectorStyle" xmi:id="_TTmfEfTrEeKROP7mUifaFQ" routing="Rectilinear" closestDistance="true" lineColor="4210752"/> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_TTmfEfTrEeKROP7mUifaFQ" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_TTmfEvTrEeKROP7mUifaFQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//SetupTaskContainer/setupTasks"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TTmfE_TrEeKROP7mUifaFQ" points="[-78, 7, 258, 18]$[-227, 7, 109, 18]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TTmfE_TrEeKROP7mUifaFQ" points="[-78, 0, 539, 46]$[-522, 0, 95, 46]"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TTslsPTrEeKROP7mUifaFQ" id="(0.5987654320987654,0.11764705882352941)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_UYR_cPT8EeKyR41VsO_Bpw" type="3003" source="_bOTg8OoYEeKpRf481yfX-g" target="_RhEkcOoJEeKpRf481yfX-g"> <styles xmi:type="notation:ConnectorStyle" xmi:id="_UYR_cfT8EeKyR41VsO_Bpw" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_UYR_cvT8EeKyR41VsO_Bpw" fontName="Segoe UI"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UYR_c_T8EeKyR41VsO_Bpw" points="[-10, -9, 386, 163]$[-10, -94, 386, 78]$[-397, -94, -1, 78]$[-397, -151, -1, 21]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UYR_c_T8EeKyR41VsO_Bpw" points="[-5, -9, 212, 275]$[-5, -169, 212, 115]$[-210, -169, 7, 115]$[-210, -263, 7, 21]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UYYGEPT8EeKyR41VsO_Bpw" id="(0.5686274509803921,0.11764705882352941)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_UUhu0AV5EeORNPhE9cWxTA" visible="false" type="3003" source="_LJQ64PTrEeKROP7mUifaFQ" target="_7oaMoAVzEeORNPhE9cWxTA"> @@ -849,7 +881,7 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PXmFUQV6EeORNPhE9cWxTA" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_PXmFUgV6EeORNPhE9cWxTA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//WorkingSetTask/workingSets"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PXmFUwV6EeORNPhE9cWxTA" points="[63, 1, 57, -71]$[123, 1, 117, -71]$[123, 94, 117, 22]$[81, 94, 75, 22]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PXmFUwV6EeORNPhE9cWxTA" points="[-2, 21, -6, -110]$[-2, 90, -6, -41]"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_DwQHYAV9EeORNPhE9cWxTA" visible="false" type="3003" source="_-8kV8AV8EeORNPhE9cWxTA" target="_7oaMoAVzEeORNPhE9cWxTA"> <styles xmi:type="notation:ConnectorStyle" xmi:id="_DwQHYQV9EeORNPhE9cWxTA" routing="Rectilinear" lineColor="4210752"/> @@ -863,27 +895,27 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_NmcJYQV9EeORNPhE9cWxTA" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_NmcJYgV9EeORNPhE9cWxTA" fontName="Segoe UI"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NmcJYwV9EeORNPhE9cWxTA" points="[53, -11, -243, 142]$[53, -26, -243, 127]$[270, -26, -26, 127]$[270, -129, -26, 24]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NmcJYwV9EeORNPhE9cWxTA" points="[13, -9, 7, 155]$[13, -143, 7, 21]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NmkFMAV9EeORNPhE9cWxTA" id="(0.39766081871345027,0.18604651162790697)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_qibXkAV9EeORNPhE9cWxTA" type="3002" source="_7oaMoAVzEeORNPhE9cWxTA" target="_7oaMoAVzEeORNPhE9cWxTA"> <children xmi:type="notation:Node" xmi:id="_qidMwAV9EeORNPhE9cWxTA" type="4011"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_qidMwQV9EeORNPhE9cWxTA" x="-118" y="28"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_qidMwQV9EeORNPhE9cWxTA" x="-11" y="-19"/> </children> <children xmi:type="notation:Node" xmi:id="_qidMwgV9EeORNPhE9cWxTA" type="4012"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_qidMwwV9EeORNPhE9cWxTA" x="32" y="-11"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_qidMwwV9EeORNPhE9cWxTA" x="15" y="16"/> </children> <styles xmi:type="notation:ConnectorStyle" xmi:id="_qibXkQV9EeORNPhE9cWxTA" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_qibXkgV9EeORNPhE9cWxTA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//SetupTask/requirements"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qibXkwV9EeORNPhE9cWxTA" points="[-99, 53, -203, 8]$[-99, 127, -203, 82]$[-195, 127, -299, 82]$[-195, 22, -299, -23]$[-135, 22, -239, -23]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qibXkwV9EeORNPhE9cWxTA" points="[-103, 61, -193, 9]$[-103, 95, -193, 43]$[-178, 95, -268, 43]$[-178, 27, -268, -25]$[-118, 27, -208, -25]"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qijTYAV9EeORNPhE9cWxTA" id="(0.8827160493827161,0.9264705882352942)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_NUY90AWCEeORNPhE9cWxTA" type="3003" source="__XTX4AWBEeORNPhE9cWxTA" target="_RhEkcOoJEeKpRf481yfX-g"> <styles xmi:type="notation:ConnectorStyle" xmi:id="_NUY90QWCEeORNPhE9cWxTA" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_NUY90gWCEeORNPhE9cWxTA" fontName="Segoe UI"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NUY90wWCEeORNPhE9cWxTA" points="[-1, -20, -1, 163]$[-1, -162, -1, 21]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NUY90wWCEeORNPhE9cWxTA" points="[1, -20, -383, 155]$[1, -60, -383, 115]$[391, -60, 7, 115]$[391, -154, 7, 21]"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_pnaukAWCEeORNPhE9cWxTA" type="3002" source="_7oaMoAVzEeORNPhE9cWxTA" target="__XTX4AWBEeORNPhE9cWxTA"> <children xmi:type="notation:Node" xmi:id="_pnj4gAWCEeORNPhE9cWxTA" type="4011"> @@ -965,10 +997,10 @@ <children xmi:type="notation:Node" xmi:id="_hJ8I0DWOEeO0we5dUm5hxw" type="4012"> <layoutConstraint xmi:type="notation:Location" xmi:id="_hJ8I0TWOEeO0we5dUm5hxw" x="-10" y="46"/> </children> - <styles xmi:type="notation:ConnectorStyle" xmi:id="_hJ66sTWOEeO0we5dUm5hxw" lineColor="4210752"/> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_hJ66sTWOEeO0we5dUm5hxw" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_hJ66sjWOEeO0we5dUm5hxw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> <element xmi:type="ecore:EReference" href="setup.ecore#//TextModifyTask/modifications"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hJ66szWOEeO0we5dUm5hxw" points="[-3, 31, 8, -67]$[-10, 122, 1, 24]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hJ66szWOEeO0we5dUm5hxw" points="[0, 25, 51, -104]$[0, 96, 51, -33]"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hJ9W8DWOEeO0we5dUm5hxw" id="(0.1891891891891892,0.5102040816326531)"/> </edges> <edges xmi:type="notation:Edge" xmi:id="_P6PtMDWPEeO0we5dUm5hxw" visible="false" type="3003" source="_am8vMDWJEeO0we5dUm5hxw" target="_7oaMoAVzEeORNPhE9cWxTA"> @@ -981,8 +1013,27 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_dFqQQTYsEeO8Ub-p5y_fsQ" routing="Rectilinear" lineColor="4210752"/> <styles xmi:type="notation:FontStyle" xmi:id="_dFqQQjYsEeO8Ub-p5y_fsQ" fontName="Segoe UI"/> <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dFqQQzYsEeO8Ub-p5y_fsQ" points="[11, -9, -513, 455]$[525, -471, 1, -7]"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dFqQQzYsEeO8Ub-p5y_fsQ" points="[36, -9, -316, 87]$[36, -48, -316, 48]$[401, -48, 49, 48]$[401, -83, 49, 13]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dF2dgDYsEeO8Ub-p5y_fsQ" id="(0.3089887640449438,0.14705882352941177)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dF2dgTYsEeO8Ub-p5y_fsQ" id="(0.09933774834437085,0.6938775510204082)"/> </edges> + <edges xmi:type="notation:Edge" xmi:id="_QPHqcDpEEeOm3ZfER1Sl2A" visible="false" type="3003" source="_cRNVkDo_EeOm3ZfER1Sl2A" target="_7oaMoAVzEeORNPhE9cWxTA"> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_QPIRgDpEEeOm3ZfER1Sl2A" routing="Rectilinear" lineColor="4210752"/> + <styles xmi:type="notation:FontStyle" xmi:id="_QPIRgTpEEeOm3ZfER1Sl2A" fontName="Segoe UI"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QPIRgjpEEeOm3ZfER1Sl2A" points="[-11, -20, 468, 898]$[-477, -940, 2, -22]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QPQNUDpEEeOm3ZfER1Sl2A" id="(0.5042016806722689,0.18699186991869918)"/> + </edges> + <edges xmi:type="notation:Edge" xmi:id="_3ms4EDrkEeOm3ZfER1Sl2A" type="3002" source="_cRNVkDo_EeOm3ZfER1Sl2A" target="_zKlSEDrkEeOm3ZfER1Sl2A"> + <children xmi:type="notation:Node" xmi:id="_3mvUUDrkEeOm3ZfER1Sl2A" type="4011"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_3mvUUTrkEeOm3ZfER1Sl2A" x="-7" y="-68"/> + </children> + <children xmi:type="notation:Node" xmi:id="_3mwicDrkEeOm3ZfER1Sl2A" type="4012"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_3mwicTrkEeOm3ZfER1Sl2A" x="-7" y="14"/> + </children> + <styles xmi:type="notation:ConnectorStyle" xmi:id="_3ms4ETrkEeOm3ZfER1Sl2A" lineColor="4210752"/> + <styles xmi:type="notation:FontStyle" xmi:id="_3ms4EjrkEeOm3ZfER1Sl2A" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/> + <element xmi:type="ecore:EReference" href="setup.ecore#//KeyBindingTask/commandParameters"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ms4EzrkEeOm3ZfER1Sl2A" points="[-2, 76, -1, -102]$[-2, 211, -1, 33]"/> + </edges> </notation:Diagram> diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CommandParameter.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CommandParameter.java new file mode 100644 index 0000000000..7795834b0d --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/CommandParameter.java @@ -0,0 +1,78 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Command Parameter</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.cdo.releng.setup.CommandParameter#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.CommandParameter#getValue <em>Value</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getCommandParameter() + * @model + * @generated + */ +public interface CommandParameter extends EObject +{ + /** + * Returns the value of the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Id</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Id</em>' attribute. + * @see #setId(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getCommandParameter_Id() + * @model + * @generated + */ + String getId(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.CommandParameter#getId <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Id</em>' attribute. + * @see #getId() + * @generated + */ + void setId(String value); + + /** + * Returns the value of the '<em><b>Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Value</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Value</em>' attribute. + * @see #setValue(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getCommandParameter_Value() + * @model + * @generated + */ + String getValue(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.CommandParameter#getValue <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Value</em>' attribute. + * @see #getValue() + * @generated + */ + void setValue(String value); + +} // CommandParameter diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/KeyBindingTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/KeyBindingTask.java new file mode 100644 index 0000000000..00dd82a9d4 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/KeyBindingTask.java @@ -0,0 +1,213 @@ +/* + * 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; + +import org.eclipse.emf.common.util.EList; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Key Binding Task</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getScheme <em>Scheme</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getContext <em>Context</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getPlatform <em>Platform</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getLocale <em>Locale</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getKeys <em>Keys</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getCommand <em>Command</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getCommandParameters <em>Command Parameters</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask() + * @model + * @generated + */ +public interface KeyBindingTask extends SetupTask +{ + + /** + * Returns the value of the '<em><b>Scheme</b></em>' attribute. + * The default value is <code>"org.eclipse.ui.defaultAcceleratorConfiguration"</code>. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Scheme</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Scheme</em>' attribute. + * @see #setScheme(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask_Scheme() + * @model default="org.eclipse.ui.defaultAcceleratorConfiguration" + * @generated + */ + String getScheme(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getScheme <em>Scheme</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Scheme</em>' attribute. + * @see #getScheme() + * @generated + */ + void setScheme(String value); + + /** + * Returns the value of the '<em><b>Context</b></em>' attribute. + * The default value is <code>"org.eclipse.ui.contexts.window"</code>. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Context</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Context</em>' attribute. + * @see #setContext(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask_Context() + * @model default="org.eclipse.ui.contexts.window" + * @generated + */ + String getContext(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getContext <em>Context</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Context</em>' attribute. + * @see #getContext() + * @generated + */ + void setContext(String value); + + /** + * Returns the value of the '<em><b>Platform</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Platform</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Platform</em>' attribute. + * @see #setPlatform(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask_Platform() + * @model + * @generated + */ + String getPlatform(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getPlatform <em>Platform</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Platform</em>' attribute. + * @see #getPlatform() + * @generated + */ + void setPlatform(String value); + + /** + * Returns the value of the '<em><b>Locale</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Locale</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Locale</em>' attribute. + * @see #setLocale(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask_Locale() + * @model + * @generated + */ + String getLocale(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getLocale <em>Locale</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Locale</em>' attribute. + * @see #getLocale() + * @generated + */ + void setLocale(String value); + + /** + * Returns the value of the '<em><b>Keys</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Keys</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Keys</em>' attribute. + * @see #setKeys(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask_Keys() + * @model + * @generated + */ + String getKeys(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getKeys <em>Keys</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Keys</em>' attribute. + * @see #getKeys() + * @generated + */ + void setKeys(String value); + + /** + * Returns the value of the '<em><b>Command</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Command</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Command</em>' attribute. + * @see #setCommand(String) + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask_Command() + * @model + * @generated + */ + String getCommand(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getCommand <em>Command</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Command</em>' attribute. + * @see #getCommand() + * @generated + */ + void setCommand(String value); + + /** + * Returns the value of the '<em><b>Command Parameters</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.releng.setup.CommandParameter}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Command Parameters</em>' containment reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Command Parameters</em>' containment reference list. + * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getKeyBindingTask_CommandParameters() + * @model containment="true" resolveProxies="true" + * @generated + */ + EList<CommandParameter> getCommandParameters(); +} // KeyBindingTask diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupFactory.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupFactory.java index f0eb8f7a9a..3455ba33d2 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupFactory.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupFactory.java @@ -157,9 +157,27 @@ public interface SetupFactory extends EFactory TextModification createTextModification(); /** + * Returns a new object of class '<em>Key Binding Task</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Key Binding Task</em>'. + * @generated + */ + KeyBindingTask createKeyBindingTask(); + + /** + * Returns a new object of class '<em>Command Parameter</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Command Parameter</em>'. + * @generated + */ + CommandParameter createCommandParameter(); + + /** * Returns a new object of class '<em>Eclipse Ini Task</em>'. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @return a new object of class '<em>Eclipse Ini Task</em>'. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java index 8040621c5c..71e37e94e6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java @@ -1359,12 +1359,12 @@ public interface SetupPackage extends EPackage int WORKING_SET_TASK__WORKING_SETS = SETUP_TASK_FEATURE_COUNT + 0; /** - * The number of structural features of the '<em>Working Set Task</em>' class. - * <!-- begin-user-doc --> + * The number of structural features of the '<em>Working Set Task</em>' class. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated - * @ordered - */ + * @generated + * @ordered + */ int WORKING_SET_TASK_FEATURE_COUNT = SETUP_TASK_FEATURE_COUNT + 1; /** @@ -1551,14 +1551,169 @@ public interface SetupPackage extends EPackage int TEXT_MODIFICATION_FEATURE_COUNT = 2; /** + * The meta object id for the '{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl <em>Key Binding Task</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl + * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getKeyBindingTask() + * @generated + */ + int KEY_BINDING_TASK = 25; + + /** + * The feature id for the '<em><b>Requirements</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__REQUIREMENTS = SETUP_TASK__REQUIREMENTS; + + /** + * The feature id for the '<em><b>Restrictions</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__RESTRICTIONS = SETUP_TASK__RESTRICTIONS; + + /** + * The feature id for the '<em><b>Scope</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__SCOPE = SETUP_TASK__SCOPE; + + /** + * The feature id for the '<em><b>Excluded Triggers</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__EXCLUDED_TRIGGERS = SETUP_TASK__EXCLUDED_TRIGGERS; + + /** + * The feature id for the '<em><b>Scheme</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__SCHEME = SETUP_TASK_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Context</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__CONTEXT = SETUP_TASK_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Platform</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__PLATFORM = SETUP_TASK_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Locale</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__LOCALE = SETUP_TASK_FEATURE_COUNT + 3; + + /** + * The feature id for the '<em><b>Keys</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__KEYS = SETUP_TASK_FEATURE_COUNT + 4; + + /** + * The feature id for the '<em><b>Command</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__COMMAND = SETUP_TASK_FEATURE_COUNT + 5; + + /** + * The feature id for the '<em><b>Command Parameters</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK__COMMAND_PARAMETERS = SETUP_TASK_FEATURE_COUNT + 6; + + /** + * The number of structural features of the '<em>Key Binding Task</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int KEY_BINDING_TASK_FEATURE_COUNT = SETUP_TASK_FEATURE_COUNT + 7; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.releng.setup.impl.CommandParameterImpl <em>Command Parameter</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.releng.setup.impl.CommandParameterImpl + * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getCommandParameter() + * @generated + */ + int COMMAND_PARAMETER = 26; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COMMAND_PARAMETER__ID = 0; + + /** + * The feature id for the '<em><b>Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COMMAND_PARAMETER__VALUE = 1; + + /** + * The number of structural features of the '<em>Command Parameter</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int COMMAND_PARAMETER_FEATURE_COUNT = 2; + + /** * The meta object id for the '{@link org.eclipse.emf.cdo.releng.setup.SetupTaskScope <em>Task Scope</em>}' enum. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @see org.eclipse.emf.cdo.releng.setup.SetupTaskScope * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getSetupTaskScope() * @generated */ - int SETUP_TASK_SCOPE = 25; + int SETUP_TASK_SCOPE = 27; /** * The meta object id for the '{@link org.eclipse.emf.cdo.releng.setup.Trigger <em>Trigger</em>}' enum. @@ -1568,7 +1723,7 @@ public interface SetupPackage extends EPackage * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getTrigger() * @generated */ - int TRIGGER = 26; + int TRIGGER = 28; /** * The meta object id for the '<em>URI</em>' data type. @@ -1578,7 +1733,7 @@ public interface SetupPackage extends EPackage * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getURI() * @generated */ - int URI = 27; + int URI = 31; /** * The meta object id for the '<em>Exception</em>' data type. @@ -1588,7 +1743,7 @@ public interface SetupPackage extends EPackage * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getException() * @generated */ - int EXCEPTION = 28; + int EXCEPTION = 30; /** * The meta object id for the '<em>Trigger Set</em>' data type. @@ -2083,13 +2238,13 @@ public interface SetupPackage extends EPackage EReference getWorkingSetTask_WorkingSets(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.setup.ResourceCopyTask <em>Resource Copy Task</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.setup.ResourceCopyTask <em>Resource Copy Task</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Resource Copy Task</em>'. - * @see org.eclipse.emf.cdo.releng.setup.ResourceCopyTask - * @generated - */ + * @return the meta object for class '<em>Resource Copy Task</em>'. + * @see org.eclipse.emf.cdo.releng.setup.ResourceCopyTask + * @generated + */ EClass getResourceCopyTask(); /** @@ -2179,9 +2334,128 @@ public interface SetupPackage extends EPackage EAttribute getTextModification_Substitutions(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask <em>Key Binding Task</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Key Binding Task</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask + * @generated + */ + EClass getKeyBindingTask(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getScheme <em>Scheme</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Scheme</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getScheme() + * @see #getKeyBindingTask() + * @generated + */ + EAttribute getKeyBindingTask_Scheme(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getContext <em>Context</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Context</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getContext() + * @see #getKeyBindingTask() + * @generated + */ + EAttribute getKeyBindingTask_Context(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getPlatform <em>Platform</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Platform</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getPlatform() + * @see #getKeyBindingTask() + * @generated + */ + EAttribute getKeyBindingTask_Platform(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getLocale <em>Locale</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Locale</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getLocale() + * @see #getKeyBindingTask() + * @generated + */ + EAttribute getKeyBindingTask_Locale(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getKeys <em>Keys</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Keys</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getKeys() + * @see #getKeyBindingTask() + * @generated + */ + EAttribute getKeyBindingTask_Keys(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getCommand <em>Command</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Command</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getCommand() + * @see #getKeyBindingTask() + * @generated + */ + EAttribute getKeyBindingTask_Command(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getCommandParameters <em>Command Parameters</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference list '<em>Command Parameters</em>'. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask#getCommandParameters() + * @see #getKeyBindingTask() + * @generated + */ + EReference getKeyBindingTask_CommandParameters(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.setup.CommandParameter <em>Command Parameter</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Command Parameter</em>'. + * @see org.eclipse.emf.cdo.releng.setup.CommandParameter + * @generated + */ + EClass getCommandParameter(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.CommandParameter#getId <em>Id</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Id</em>'. + * @see org.eclipse.emf.cdo.releng.setup.CommandParameter#getId() + * @see #getCommandParameter() + * @generated + */ + EAttribute getCommandParameter_Id(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.CommandParameter#getValue <em>Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Value</em>'. + * @see org.eclipse.emf.cdo.releng.setup.CommandParameter#getValue() + * @see #getCommandParameter() + * @generated + */ + EAttribute getCommandParameter_Value(); + + /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.setup.EclipseIniTask <em>Eclipse Ini Task</em>}'. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @return the meta object for class '<em>Eclipse Ini Task</em>'. * @see org.eclipse.emf.cdo.releng.setup.EclipseIniTask * @generated @@ -2908,13 +3182,13 @@ public interface SetupPackage extends EPackage EReference WORKING_SET_TASK__WORKING_SETS = eINSTANCE.getWorkingSetTask_WorkingSets(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.setup.impl.ResourceCopyTaskImpl <em>Resource Copy Task</em>}' class. - * <!-- begin-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.setup.impl.ResourceCopyTaskImpl <em>Resource Copy Task</em>}' class. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.emf.cdo.releng.setup.impl.ResourceCopyTaskImpl - * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getResourceCopyTask() - * @generated - */ + * @see org.eclipse.emf.cdo.releng.setup.impl.ResourceCopyTaskImpl + * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getResourceCopyTask() + * @generated + */ EClass RESOURCE_COPY_TASK = eINSTANCE.getResourceCopyTask(); /** @@ -2986,9 +3260,101 @@ public interface SetupPackage extends EPackage EAttribute TEXT_MODIFICATION__SUBSTITUTIONS = eINSTANCE.getTextModification_Substitutions(); /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl <em>Key Binding Task</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl + * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getKeyBindingTask() + * @generated + */ + EClass KEY_BINDING_TASK = eINSTANCE.getKeyBindingTask(); + + /** + * The meta object literal for the '<em><b>Scheme</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute KEY_BINDING_TASK__SCHEME = eINSTANCE.getKeyBindingTask_Scheme(); + + /** + * The meta object literal for the '<em><b>Context</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute KEY_BINDING_TASK__CONTEXT = eINSTANCE.getKeyBindingTask_Context(); + + /** + * The meta object literal for the '<em><b>Platform</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute KEY_BINDING_TASK__PLATFORM = eINSTANCE.getKeyBindingTask_Platform(); + + /** + * The meta object literal for the '<em><b>Locale</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute KEY_BINDING_TASK__LOCALE = eINSTANCE.getKeyBindingTask_Locale(); + + /** + * The meta object literal for the '<em><b>Keys</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute KEY_BINDING_TASK__KEYS = eINSTANCE.getKeyBindingTask_Keys(); + + /** + * The meta object literal for the '<em><b>Command</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute KEY_BINDING_TASK__COMMAND = eINSTANCE.getKeyBindingTask_Command(); + + /** + * The meta object literal for the '<em><b>Command Parameters</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference KEY_BINDING_TASK__COMMAND_PARAMETERS = eINSTANCE.getKeyBindingTask_CommandParameters(); + + /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.setup.impl.CommandParameterImpl <em>Command Parameter</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.releng.setup.impl.CommandParameterImpl + * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getCommandParameter() + * @generated + */ + EClass COMMAND_PARAMETER = eINSTANCE.getCommandParameter(); + + /** + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute COMMAND_PARAMETER__ID = eINSTANCE.getCommandParameter_Id(); + + /** + * The meta object literal for the '<em><b>Value</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute COMMAND_PARAMETER__VALUE = eINSTANCE.getCommandParameter_Value(); + + /** * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.setup.impl.EclipseIniTaskImpl <em>Eclipse Ini Task</em>}' class. * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> * @see org.eclipse.emf.cdo.releng.setup.impl.EclipseIniTaskImpl * @see org.eclipse.emf.cdo.releng.setup.impl.SetupPackageImpl#getEclipseIniTask() * @generated diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java index 4c28be20b8..c2c6a1d614 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ApiBaselineTaskImpl.java @@ -137,10 +137,8 @@ public class ApiBaselineTaskImpl extends SetupTaskImpl implements ApiBaselineTas String oldVersion = version; version = newVersion; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.API_BASELINE_TASK__VERSION, oldVersion, version)); - } } /** @@ -163,10 +161,8 @@ public class ApiBaselineTaskImpl extends SetupTaskImpl implements ApiBaselineTas String oldZipLocation = zipLocation; zipLocation = newZipLocation; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.API_BASELINE_TASK__ZIP_LOCATION, oldZipLocation, zipLocation)); - } } /** @@ -254,9 +250,7 @@ public class ApiBaselineTaskImpl extends SetupTaskImpl implements ApiBaselineTas public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (version: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java index 688e453882..12b35261d6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java @@ -169,10 +169,8 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins String oldMspec = mspec; mspec = newMspec; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.BUCKMINSTER_IMPORT_TASK__MSPEC, oldMspec, mspec)); - } } /** @@ -195,10 +193,8 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins String oldTargetPlatform = targetPlatform; targetPlatform = newTargetPlatform; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.BUCKMINSTER_IMPORT_TASK__TARGET_PLATFORM, oldTargetPlatform, targetPlatform)); - } } /** @@ -221,10 +217,8 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins String oldBundlePool = bundlePool; bundlePool = newBundlePool; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.BUCKMINSTER_IMPORT_TASK__BUNDLE_POOL, oldBundlePool, bundlePool)); - } } /** @@ -323,9 +317,7 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (mspec: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CommandParameterImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CommandParameterImpl.java new file mode 100644 index 0000000000..df9e4a4848 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CommandParameterImpl.java @@ -0,0 +1,232 @@ +/** + */ +package org.eclipse.emf.cdo.releng.setup.impl; + +import org.eclipse.emf.cdo.releng.setup.CommandParameter; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Command Parameter</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.CommandParameterImpl#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.CommandParameterImpl#getValue <em>Value</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class CommandParameterImpl extends MinimalEObjectImpl.Container implements CommandParameter +{ + /** + * The default value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected static final String ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected String id = ID_EDEFAULT; + + /** + * The default value of the '{@link #getValue() <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValue() + * @generated + * @ordered + */ + protected static final String VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValue() + * @generated + * @ordered + */ + protected String value = VALUE_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected CommandParameterImpl() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return SetupPackage.Literals.COMMAND_PARAMETER; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getId() + { + return id; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setId(String newId) + { + String oldId = id; + id = newId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.COMMAND_PARAMETER__ID, oldId, id)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getValue() + { + return value; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setValue(String newValue) + { + String oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.COMMAND_PARAMETER__VALUE, oldValue, value)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case SetupPackage.COMMAND_PARAMETER__ID: + return getId(); + case SetupPackage.COMMAND_PARAMETER__VALUE: + return getValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case SetupPackage.COMMAND_PARAMETER__ID: + setId((String)newValue); + return; + case SetupPackage.COMMAND_PARAMETER__VALUE: + setValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case SetupPackage.COMMAND_PARAMETER__ID: + setId(ID_EDEFAULT); + return; + case SetupPackage.COMMAND_PARAMETER__VALUE: + setValue(VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case SetupPackage.COMMAND_PARAMETER__ID: + return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); + case SetupPackage.COMMAND_PARAMETER__VALUE: + return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) + return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (id: "); + result.append(id); + result.append(", value: "); + result.append(value); + result.append(')'); + return result.toString(); + } + +} // CommandParameterImpl diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java index 44eb1fafbe..72fe19dfa6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/CompoundSetupTaskImpl.java @@ -129,9 +129,7 @@ public class CompoundSetupTaskImpl extends SetupTaskImpl implements CompoundSetu String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.COMPOUND_SETUP_TASK__NAME, oldName, name)); - } } /** @@ -279,9 +277,7 @@ public class CompoundSetupTaskImpl extends SetupTaskImpl implements CompoundSetu public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java index 4eed5e3791..0b58026282 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipseIniTaskImpl.java @@ -146,9 +146,7 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask String oldOption = option; option = newOption; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_INI_TASK__OPTION, oldOption, option)); - } } /** @@ -171,9 +169,7 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask String oldValue = value; value = newValue; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_INI_TASK__VALUE, oldValue, value)); - } } /** @@ -196,9 +192,7 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask boolean oldVm = vm; vm = newVm; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_INI_TASK__VM, oldVm, vm)); - } } /** @@ -296,9 +290,7 @@ public class EclipseIniTaskImpl extends SetupTaskImpl implements EclipseIniTask public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (option: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java index 2088fdd77f..4aadebc04d 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java @@ -127,9 +127,7 @@ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipseP String oldKey = key; key = newKey; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_PREFERENCE_TASK__KEY, oldKey, key)); - } } /** @@ -152,10 +150,8 @@ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipseP String oldValue = value; value = newValue; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ECLIPSE_PREFERENCE_TASK__VALUE, oldValue, value)); - } } /** @@ -243,9 +239,7 @@ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipseP public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java index 1e4d7a4684..8ed0e4caff 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java @@ -185,9 +185,7 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__NAME, oldName, name)); - } } /** @@ -210,10 +208,8 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask String oldRemoteName = remoteName; remoteName = newRemoteName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__REMOTE_NAME, oldRemoteName, remoteName)); - } } /** @@ -236,10 +232,8 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask String oldRemoteURI = remoteURI; remoteURI = newRemoteURI; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__REMOTE_URI, oldRemoteURI, remoteURI)); - } } /** @@ -262,10 +256,8 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask String oldCheckoutBranch = checkoutBranch; checkoutBranch = newCheckoutBranch; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__CHECKOUT_BRANCH, oldCheckoutBranch, checkoutBranch)); - } } /** @@ -374,9 +366,7 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/KeyBindingTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/KeyBindingTaskImpl.java new file mode 100644 index 0000000000..ddc8fafa2a --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/KeyBindingTaskImpl.java @@ -0,0 +1,656 @@ +/* + * 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.impl; + +import org.eclipse.emf.cdo.releng.setup.CommandParameter; +import org.eclipse.emf.cdo.releng.setup.KeyBindingTask; +import org.eclipse.emf.cdo.releng.setup.SetupPackage; +import org.eclipse.emf.cdo.releng.setup.SetupTaskContext; +import org.eclipse.emf.cdo.releng.setup.Trigger; + +import org.eclipse.net4j.util.ObjectUtil; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.core.commands.Command; +import org.eclipse.core.commands.ParameterizedCommand; +import org.eclipse.core.commands.common.NotDefinedException; +import org.eclipse.jface.bindings.Binding; +import org.eclipse.jface.bindings.keys.KeyBinding; +import org.eclipse.jface.bindings.keys.KeySequence; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.commands.ICommandService; +import org.eclipse.ui.keys.IBindingService; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Key Binding Task</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl#getScheme <em>Scheme</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl#getContext <em>Context</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl#getPlatform <em>Platform</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl#getLocale <em>Locale</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl#getKeys <em>Keys</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl#getCommand <em>Command</em>}</li> + * <li>{@link org.eclipse.emf.cdo.releng.setup.impl.KeyBindingTaskImpl#getCommandParameters <em>Command Parameters</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class KeyBindingTaskImpl extends SetupTaskImpl implements KeyBindingTask +{ + /** + * The default value of the '{@link #getScheme() <em>Scheme</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getScheme() + * @generated + * @ordered + */ + protected static final String SCHEME_EDEFAULT = "org.eclipse.ui.defaultAcceleratorConfiguration"; + + /** + * The cached value of the '{@link #getScheme() <em>Scheme</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getScheme() + * @generated + * @ordered + */ + protected String scheme = SCHEME_EDEFAULT; + + /** + * The default value of the '{@link #getContext() <em>Context</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getContext() + * @generated + * @ordered + */ + protected static final String CONTEXT_EDEFAULT = "org.eclipse.ui.contexts.window"; + + /** + * The cached value of the '{@link #getContext() <em>Context</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getContext() + * @generated + * @ordered + */ + protected String context = CONTEXT_EDEFAULT; + + /** + * The default value of the '{@link #getPlatform() <em>Platform</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getPlatform() + * @generated + * @ordered + */ + protected static final String PLATFORM_EDEFAULT = null; + + /** + * The cached value of the '{@link #getPlatform() <em>Platform</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getPlatform() + * @generated + * @ordered + */ + protected String platform = PLATFORM_EDEFAULT; + + /** + * The default value of the '{@link #getLocale() <em>Locale</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getLocale() + * @generated + * @ordered + */ + protected static final String LOCALE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getLocale() <em>Locale</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getLocale() + * @generated + * @ordered + */ + protected String locale = LOCALE_EDEFAULT; + + /** + * The default value of the '{@link #getKeys() <em>Keys</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getKeys() + * @generated + * @ordered + */ + protected static final String KEYS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getKeys() <em>Keys</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getKeys() + * @generated + * @ordered + */ + protected String keys = KEYS_EDEFAULT; + + /** + * The default value of the '{@link #getCommand() <em>Command</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCommand() + * @generated + * @ordered + */ + protected static final String COMMAND_EDEFAULT = null; + + /** + * The cached value of the '{@link #getCommand() <em>Command</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCommand() + * @generated + * @ordered + */ + protected String command = COMMAND_EDEFAULT; + + /** + * The cached value of the '{@link #getCommandParameters() <em>Command Parameters</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCommandParameters() + * @generated + * @ordered + */ + protected EList<CommandParameter> commandParameters; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected KeyBindingTaskImpl() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return SetupPackage.Literals.KEY_BINDING_TASK; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getScheme() + { + return scheme; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setScheme(String newScheme) + { + String oldScheme = scheme; + scheme = newScheme; + if (eNotificationRequired()) + { + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.KEY_BINDING_TASK__SCHEME, oldScheme, scheme)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getContext() + { + return context; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setContext(String newContext) + { + String oldContext = context; + context = newContext; + if (eNotificationRequired()) + { + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.KEY_BINDING_TASK__CONTEXT, oldContext, context)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getPlatform() + { + return platform; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setPlatform(String newPlatform) + { + String oldPlatform = platform; + platform = newPlatform; + if (eNotificationRequired()) + { + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.KEY_BINDING_TASK__PLATFORM, oldPlatform, + platform)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getLocale() + { + return locale; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setLocale(String newLocale) + { + String oldLocale = locale; + locale = newLocale; + if (eNotificationRequired()) + { + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.KEY_BINDING_TASK__LOCALE, oldLocale, locale)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getKeys() + { + return keys; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setKeys(String newKeys) + { + String oldKeys = keys; + keys = newKeys; + if (eNotificationRequired()) + { + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.KEY_BINDING_TASK__KEYS, oldKeys, keys)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getCommand() + { + return command; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setCommand(String newCommand) + { + String oldCommand = command; + command = newCommand; + if (eNotificationRequired()) + { + eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.KEY_BINDING_TASK__COMMAND, oldCommand, command)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<CommandParameter> getCommandParameters() + { + if (commandParameters == null) + { + commandParameters = new EObjectContainmentEList.Resolving<CommandParameter>(CommandParameter.class, this, + SetupPackage.KEY_BINDING_TASK__COMMAND_PARAMETERS); + } + return commandParameters; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) + { + switch (featureID) + { + case SetupPackage.KEY_BINDING_TASK__COMMAND_PARAMETERS: + return ((InternalEList<?>)getCommandParameters()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case SetupPackage.KEY_BINDING_TASK__SCHEME: + return getScheme(); + case SetupPackage.KEY_BINDING_TASK__CONTEXT: + return getContext(); + case SetupPackage.KEY_BINDING_TASK__PLATFORM: + return getPlatform(); + case SetupPackage.KEY_BINDING_TASK__LOCALE: + return getLocale(); + case SetupPackage.KEY_BINDING_TASK__KEYS: + return getKeys(); + case SetupPackage.KEY_BINDING_TASK__COMMAND: + return getCommand(); + case SetupPackage.KEY_BINDING_TASK__COMMAND_PARAMETERS: + return getCommandParameters(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case SetupPackage.KEY_BINDING_TASK__SCHEME: + setScheme((String)newValue); + return; + case SetupPackage.KEY_BINDING_TASK__CONTEXT: + setContext((String)newValue); + return; + case SetupPackage.KEY_BINDING_TASK__PLATFORM: + setPlatform((String)newValue); + return; + case SetupPackage.KEY_BINDING_TASK__LOCALE: + setLocale((String)newValue); + return; + case SetupPackage.KEY_BINDING_TASK__KEYS: + setKeys((String)newValue); + return; + case SetupPackage.KEY_BINDING_TASK__COMMAND: + setCommand((String)newValue); + return; + case SetupPackage.KEY_BINDING_TASK__COMMAND_PARAMETERS: + getCommandParameters().clear(); + getCommandParameters().addAll((Collection<? extends CommandParameter>)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case SetupPackage.KEY_BINDING_TASK__SCHEME: + setScheme(SCHEME_EDEFAULT); + return; + case SetupPackage.KEY_BINDING_TASK__CONTEXT: + setContext(CONTEXT_EDEFAULT); + return; + case SetupPackage.KEY_BINDING_TASK__PLATFORM: + setPlatform(PLATFORM_EDEFAULT); + return; + case SetupPackage.KEY_BINDING_TASK__LOCALE: + setLocale(LOCALE_EDEFAULT); + return; + case SetupPackage.KEY_BINDING_TASK__KEYS: + setKeys(KEYS_EDEFAULT); + return; + case SetupPackage.KEY_BINDING_TASK__COMMAND: + setCommand(COMMAND_EDEFAULT); + return; + case SetupPackage.KEY_BINDING_TASK__COMMAND_PARAMETERS: + getCommandParameters().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case SetupPackage.KEY_BINDING_TASK__SCHEME: + return SCHEME_EDEFAULT == null ? scheme != null : !SCHEME_EDEFAULT.equals(scheme); + case SetupPackage.KEY_BINDING_TASK__CONTEXT: + return CONTEXT_EDEFAULT == null ? context != null : !CONTEXT_EDEFAULT.equals(context); + case SetupPackage.KEY_BINDING_TASK__PLATFORM: + return PLATFORM_EDEFAULT == null ? platform != null : !PLATFORM_EDEFAULT.equals(platform); + case SetupPackage.KEY_BINDING_TASK__LOCALE: + return LOCALE_EDEFAULT == null ? locale != null : !LOCALE_EDEFAULT.equals(locale); + case SetupPackage.KEY_BINDING_TASK__KEYS: + return KEYS_EDEFAULT == null ? keys != null : !KEYS_EDEFAULT.equals(keys); + case SetupPackage.KEY_BINDING_TASK__COMMAND: + return COMMAND_EDEFAULT == null ? command != null : !COMMAND_EDEFAULT.equals(command); + case SetupPackage.KEY_BINDING_TASK__COMMAND_PARAMETERS: + return commandParameters != null && !commandParameters.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) + { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (scheme: "); + result.append(scheme); + result.append(", context: "); + result.append(context); + result.append(", platform: "); + result.append(platform); + result.append(", locale: "); + result.append(locale); + result.append(", keys: "); + result.append(keys); + result.append(", command: "); + result.append(command); + result.append(')'); + return result.toString(); + } + + @Override + public Set<Trigger> getValidTriggers() + { + return Trigger.IDE_TRIGGERS; + } + + public boolean isNeeded(SetupTaskContext context) throws Exception + { + IBindingService bindingService = (IBindingService)PlatformUI.getWorkbench().getService(IBindingService.class); + + Binding[] bindings = bindingService.getBindings(); + for (int i = 0; i < bindings.length; i++) + { + Binding binding = bindings[i]; + if (binding instanceof KeyBinding) + { + KeyBinding keyBinding = (KeyBinding)binding; + + if (!ObjectUtil.equals(keyBinding.getSchemeId(), getScheme())) + { + continue; + } + + if (!ObjectUtil.equals(keyBinding.getContextId(), getContext())) + { + continue; + } + + if (!ObjectUtil.equals(keyBinding.getPlatform(), getPlatform())) + { + continue; + } + + if (!ObjectUtil.equals(keyBinding.getLocale(), getLocale())) + { + continue; + } + + if (!ObjectUtil.equals(keyBinding.getKeySequence(), KeySequence.getInstance(getKeys()))) + { + continue; + } + + ParameterizedCommand parameterizedCommand = keyBinding.getParameterizedCommand(); + if (!ObjectUtil.equals(parameterizedCommand.getId(), getCommand())) + { + continue; + } + + if (!ObjectUtil.equals(parameterizedCommand.getParameterMap(), getCommandParameterMap())) + { + continue; + } + + return false; + } + } + + return true; + } + + public void perform(SetupTaskContext context) throws Exception + { + KeyBinding binding = new KeyBinding(KeySequence.getInstance(getKeys()), getParameterizedCommand(), getScheme(), + getContext(), getLocale(), getPlatform(), null, Binding.USER); + + IBindingService bindingService = (IBindingService)PlatformUI.getWorkbench().getService(IBindingService.class); + Binding[] bindings = bindingService.getBindings(); + + Binding[] newBindings = new Binding[bindings.length + 1]; + System.arraycopy(bindings, 0, newBindings, 0, bindings.length); + newBindings[bindings.length] = binding; + + bindingService.savePreferences(bindingService.getActiveScheme(), newBindings); + } + + private ParameterizedCommand getParameterizedCommand() throws NotDefinedException + { + ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class); + Command command = commandService.getCommand(getCommand()); + + @SuppressWarnings("rawtypes") + Map params = getCommandParameterMap(); + + return ParameterizedCommand.generateCommand(command, params); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private Map getCommandParameterMap() + { + Map params = new HashMap(); + for (CommandParameter commandParameter : getCommandParameters()) + { + params.put(commandParameter.getId(), commandParameter.getValue()); + } + + return params; + } + +} // KeyBindingTaskImpl diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java index 58a61e73a4..c8bc5d22ab 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/LinkLocationTaskImpl.java @@ -123,9 +123,7 @@ public class LinkLocationTaskImpl extends SetupTaskImpl implements LinkLocationT String oldPath = path; path = newPath; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.LINK_LOCATION_TASK__PATH, oldPath, path)); - } } /** @@ -148,9 +146,7 @@ public class LinkLocationTaskImpl extends SetupTaskImpl implements LinkLocationT String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.LINK_LOCATION_TASK__NAME, oldName, name)); - } } /** @@ -238,9 +234,7 @@ public class LinkLocationTaskImpl extends SetupTaskImpl implements LinkLocationT public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (path: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java index b725652cd6..203901175f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/OneTimeSetupTaskImpl.java @@ -97,9 +97,7 @@ public abstract class OneTimeSetupTaskImpl extends SetupTaskImpl implements OneT String oldId = id; id = newId; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.ONE_TIME_SETUP_TASK__ID, oldId, id)); - } } /** @@ -177,9 +175,7 @@ public abstract class OneTimeSetupTaskImpl extends SetupTaskImpl implements OneT public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (id: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java index ea233a23ea..4a4d7c89c8 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/ResourceCopyTaskImpl.java @@ -122,10 +122,8 @@ public class ResourceCopyTaskImpl extends SetupTaskImpl implements ResourceCopyT String oldSourceURL = sourceURL; sourceURL = newSourceURL; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.RESOURCE_COPY_TASK__SOURCE_URL, oldSourceURL, sourceURL)); - } } /** @@ -148,10 +146,8 @@ public class ResourceCopyTaskImpl extends SetupTaskImpl implements ResourceCopyT String oldTargetURL = targetURL; targetURL = newTargetURL; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.RESOURCE_COPY_TASK__TARGET_URL, oldTargetURL, targetURL)); - } } /** @@ -239,9 +235,7 @@ public class ResourceCopyTaskImpl extends SetupTaskImpl implements ResourceCopyT public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (sourceURL: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java index 502b1ce6a7..1f27cfec9a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupFactoryImpl.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.releng.setup.impl; import org.eclipse.emf.cdo.releng.setup.ApiBaselineTask; import org.eclipse.emf.cdo.releng.setup.Branch; import org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask; +import org.eclipse.emf.cdo.releng.setup.CommandParameter; import org.eclipse.emf.cdo.releng.setup.CompoundSetupTask; import org.eclipse.emf.cdo.releng.setup.Configuration; import org.eclipse.emf.cdo.releng.setup.EclipseIniTask; @@ -20,6 +21,7 @@ import org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask; import org.eclipse.emf.cdo.releng.setup.EclipseVersion; import org.eclipse.emf.cdo.releng.setup.GitCloneTask; import org.eclipse.emf.cdo.releng.setup.InstallableUnit; +import org.eclipse.emf.cdo.releng.setup.KeyBindingTask; import org.eclipse.emf.cdo.releng.setup.LinkLocationTask; import org.eclipse.emf.cdo.releng.setup.P2Repository; import org.eclipse.emf.cdo.releng.setup.P2Task; @@ -141,6 +143,10 @@ public class SetupFactoryImpl extends EFactoryImpl implements SetupFactory return createTextModifyTask(); case SetupPackage.TEXT_MODIFICATION: return createTextModification(); + case SetupPackage.KEY_BINDING_TASK: + return createKeyBindingTask(); + case SetupPackage.COMMAND_PARAMETER: + return createCommandParameter(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -160,12 +166,12 @@ public class SetupFactoryImpl extends EFactoryImpl implements SetupFactory return createSetupTaskScopeFromString(eDataType, initialValue); case SetupPackage.TRIGGER: return createTriggerFromString(eDataType, initialValue); - case SetupPackage.URI: - return createURIFromString(eDataType, initialValue); - case SetupPackage.EXCEPTION: - return createExceptionFromString(eDataType, initialValue); case SetupPackage.TRIGGER_SET: return createTriggerSetFromString(eDataType, initialValue); + case SetupPackage.EXCEPTION: + return createExceptionFromString(eDataType, initialValue); + case SetupPackage.URI: + return createURIFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -185,12 +191,12 @@ public class SetupFactoryImpl extends EFactoryImpl implements SetupFactory return convertSetupTaskScopeToString(eDataType, instanceValue); case SetupPackage.TRIGGER: return convertTriggerToString(eDataType, instanceValue); - case SetupPackage.URI: - return convertURIToString(eDataType, instanceValue); - case SetupPackage.EXCEPTION: - return convertExceptionToString(eDataType, instanceValue); case SetupPackage.TRIGGER_SET: return convertTriggerSetToString(eDataType, instanceValue); + case SetupPackage.EXCEPTION: + return convertExceptionToString(eDataType, instanceValue); + case SetupPackage.URI: + return convertURIToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -352,7 +358,29 @@ public class SetupFactoryImpl extends EFactoryImpl implements SetupFactory /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public KeyBindingTask createKeyBindingTask() + { + KeyBindingTaskImpl keyBindingTask = new KeyBindingTaskImpl(); + return keyBindingTask; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public CommandParameter createCommandParameter() + { + CommandParameterImpl commandParameter = new CommandParameterImpl(); + return commandParameter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ public EclipseIniTask createEclipseIniTask() diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupImpl.java index f84cd94845..b559eae17b 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupImpl.java @@ -111,9 +111,7 @@ public class SetupImpl extends MinimalEObjectImpl.Container implements Setup if (branch != oldBranch) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, SetupPackage.SETUP__BRANCH, oldBranch, branch)); - } } } return branch; @@ -139,9 +137,7 @@ public class SetupImpl extends MinimalEObjectImpl.Container implements Setup Branch oldBranch = branch; branch = newBranch; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.SETUP__BRANCH, oldBranch, branch)); - } } /** @@ -158,10 +154,8 @@ public class SetupImpl extends MinimalEObjectImpl.Container implements Setup if (eclipseVersion != oldEclipseVersion) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, SetupPackage.SETUP__ECLIPSE_VERSION, oldEclipseVersion, eclipseVersion)); - } } } return eclipseVersion; @@ -187,10 +181,8 @@ public class SetupImpl extends MinimalEObjectImpl.Container implements Setup EclipseVersion oldEclipseVersion = eclipseVersion; eclipseVersion = newEclipseVersion; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.SETUP__ECLIPSE_VERSION, oldEclipseVersion, eclipseVersion)); - } } /** @@ -207,10 +199,8 @@ public class SetupImpl extends MinimalEObjectImpl.Container implements Setup if (preferences != oldPreferences) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, SetupPackage.SETUP__PREFERENCES, oldPreferences, preferences)); - } } } return preferences; @@ -236,10 +226,8 @@ public class SetupImpl extends MinimalEObjectImpl.Container implements Setup Preferences oldPreferences = preferences; preferences = newPreferences; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.SETUP__PREFERENCES, oldPreferences, preferences)); - } } /** @@ -302,21 +290,15 @@ public class SetupImpl extends MinimalEObjectImpl.Container implements Setup { case SetupPackage.SETUP__BRANCH: if (resolve) - { return getBranch(); - } return basicGetBranch(); case SetupPackage.SETUP__ECLIPSE_VERSION: if (resolve) - { return getEclipseVersion(); - } return basicGetEclipseVersion(); case SetupPackage.SETUP__PREFERENCES: if (resolve) - { return getPreferences(); - } return basicGetPreferences(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java index 4305ebc213..1ea1c7e0a6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.releng.setup.impl; import org.eclipse.emf.cdo.releng.setup.ApiBaselineTask; import org.eclipse.emf.cdo.releng.setup.Branch; import org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask; +import org.eclipse.emf.cdo.releng.setup.CommandParameter; import org.eclipse.emf.cdo.releng.setup.CompoundSetupTask; import org.eclipse.emf.cdo.releng.setup.ConfigurableItem; import org.eclipse.emf.cdo.releng.setup.Configuration; @@ -21,6 +22,7 @@ import org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask; import org.eclipse.emf.cdo.releng.setup.EclipseVersion; import org.eclipse.emf.cdo.releng.setup.GitCloneTask; import org.eclipse.emf.cdo.releng.setup.InstallableUnit; +import org.eclipse.emf.cdo.releng.setup.KeyBindingTask; import org.eclipse.emf.cdo.releng.setup.LinkLocationTask; import org.eclipse.emf.cdo.releng.setup.OneTimeSetupTask; import org.eclipse.emf.cdo.releng.setup.P2Repository; @@ -174,7 +176,21 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass keyBindingTaskEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass commandParameterEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ private EClass eclipseIniTaskEClass = null; @@ -788,10 +804,10 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage } /** - * <!-- begin-user-doc --> + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated - */ + * @generated + */ public EClass getResourceCopyTask() { return resourceCopyTaskEClass; @@ -879,7 +895,117 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage /** * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getKeyBindingTask() + { + return keyBindingTaskEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getKeyBindingTask_Scheme() + { + return (EAttribute)keyBindingTaskEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getKeyBindingTask_Context() + { + return (EAttribute)keyBindingTaskEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getKeyBindingTask_Platform() + { + return (EAttribute)keyBindingTaskEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getKeyBindingTask_Locale() + { + return (EAttribute)keyBindingTaskEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getKeyBindingTask_Keys() + { + return (EAttribute)keyBindingTaskEClass.getEStructuralFeatures().get(4); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getKeyBindingTask_Command() + { + return (EAttribute)keyBindingTaskEClass.getEStructuralFeatures().get(5); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getKeyBindingTask_CommandParameters() + { + return (EReference)keyBindingTaskEClass.getEStructuralFeatures().get(6); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getCommandParameter() + { + return commandParameterEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getCommandParameter_Id() + { + return (EAttribute)commandParameterEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getCommandParameter_Value() + { + return (EAttribute)commandParameterEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ public EClass getEclipseIniTask() @@ -1312,14 +1438,27 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage createEAttribute(textModificationEClass, TEXT_MODIFICATION__PATTERN); createEAttribute(textModificationEClass, TEXT_MODIFICATION__SUBSTITUTIONS); + keyBindingTaskEClass = createEClass(KEY_BINDING_TASK); + createEAttribute(keyBindingTaskEClass, KEY_BINDING_TASK__SCHEME); + createEAttribute(keyBindingTaskEClass, KEY_BINDING_TASK__CONTEXT); + createEAttribute(keyBindingTaskEClass, KEY_BINDING_TASK__PLATFORM); + createEAttribute(keyBindingTaskEClass, KEY_BINDING_TASK__LOCALE); + createEAttribute(keyBindingTaskEClass, KEY_BINDING_TASK__KEYS); + createEAttribute(keyBindingTaskEClass, KEY_BINDING_TASK__COMMAND); + createEReference(keyBindingTaskEClass, KEY_BINDING_TASK__COMMAND_PARAMETERS); + + commandParameterEClass = createEClass(COMMAND_PARAMETER); + createEAttribute(commandParameterEClass, COMMAND_PARAMETER__ID); + createEAttribute(commandParameterEClass, COMMAND_PARAMETER__VALUE); + // Create enums setupTaskScopeEEnum = createEEnum(SETUP_TASK_SCOPE); triggerEEnum = createEEnum(TRIGGER); // Create data types - uriEDataType = createEDataType(URI); - exceptionEDataType = createEDataType(EXCEPTION); triggerSetEDataType = createEDataType(TRIGGER_SET); + exceptionEDataType = createEDataType(EXCEPTION); + uriEDataType = createEDataType(URI); } /** @@ -1375,6 +1514,7 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage workingSetTaskEClass.getESuperTypes().add(this.getSetupTask()); resourceCopyTaskEClass.getESuperTypes().add(this.getSetupTask()); textModifyTaskEClass.getESuperTypes().add(this.getSetupTask()); + keyBindingTaskEClass.getESuperTypes().add(this.getSetupTask()); // Initialize classes and features; add operations and parameters initEClass(eclipseVersionEClass, EclipseVersion.class, "EclipseVersion", !IS_ABSTRACT, !IS_INTERFACE, @@ -1603,6 +1743,34 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage TextModification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(keyBindingTaskEClass, KeyBindingTask.class, "KeyBindingTask", !IS_ABSTRACT, !IS_INTERFACE, + IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getKeyBindingTask_Scheme(), ecorePackage.getEString(), "scheme", + "org.eclipse.ui.defaultAcceleratorConfiguration", 0, 1, KeyBindingTask.class, !IS_TRANSIENT, !IS_VOLATILE, + IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getKeyBindingTask_Context(), ecorePackage.getEString(), "context", "org.eclipse.ui.contexts.window", + 0, 1, KeyBindingTask.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEAttribute(getKeyBindingTask_Platform(), ecorePackage.getEString(), "platform", null, 0, 1, + KeyBindingTask.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEAttribute(getKeyBindingTask_Locale(), ecorePackage.getEString(), "locale", null, 0, 1, KeyBindingTask.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getKeyBindingTask_Keys(), ecorePackage.getEString(), "keys", null, 0, 1, KeyBindingTask.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getKeyBindingTask_Command(), ecorePackage.getEString(), "command", null, 0, 1, KeyBindingTask.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getKeyBindingTask_CommandParameters(), this.getCommandParameter(), null, "commandParameters", null, + 0, -1, KeyBindingTask.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(commandParameterEClass, CommandParameter.class, "CommandParameter", !IS_ABSTRACT, !IS_INTERFACE, + IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getCommandParameter_Id(), ecorePackage.getEString(), "id", null, 0, 1, CommandParameter.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCommandParameter_Value(), ecorePackage.getEString(), "value", null, 0, 1, CommandParameter.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + // Initialize enums and add enum literals initEEnum(setupTaskScopeEEnum, SetupTaskScope.class, "SetupTaskScope"); addEEnumLiteral(setupTaskScopeEEnum, SetupTaskScope.NONE); @@ -1617,11 +1785,11 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage addEEnumLiteral(triggerEEnum, Trigger.MANUAL); // Initialize data types - initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", IS_SERIALIZABLE, - !IS_GENERATED_INSTANCE_CLASS); - initEDataType(exceptionEDataType, Exception.class, "Exception", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); initEDataType(triggerSetEDataType, Set.class, "TriggerSet", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS, "java.util.Set<org.eclipse.emf.cdo.releng.setup.Trigger>"); + initEDataType(exceptionEDataType, Exception.class, "Exception", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); + initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", IS_SERIALIZABLE, + !IS_GENERATED_INSTANCE_CLASS); // Create resource createResource(eNS_URI); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java index b2bc6851ae..638193f7cd 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupTaskImpl.java @@ -171,10 +171,8 @@ public abstract class SetupTaskImpl extends MinimalEObjectImpl.Container impleme Set<Trigger> oldExcludedTriggers = excludedTriggers; excludedTriggers = newExcludedTriggers; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.SETUP_TASK__EXCLUDED_TRIGGERS, oldExcludedTriggers, excludedTriggers)); - } } public void setExcludedTriggers(Set<Trigger> newExcludedTriggers) @@ -397,9 +395,7 @@ public abstract class SetupTaskImpl extends MinimalEObjectImpl.Container impleme public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (excludedTriggers: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java index 149f544714..2d740637a0 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java @@ -149,9 +149,7 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__NAME, oldName, name)); - } } /** @@ -174,9 +172,7 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria String oldValue = value; value = newValue; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__VALUE, oldValue, value)); - } } /** @@ -199,10 +195,8 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria String oldDescription = description; description = newDescription; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__DESCRIPTION, oldDescription, description)); - } } /** @@ -300,9 +294,7 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java index d9f1748b62..1b2745e6d5 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModificationImpl.java @@ -109,10 +109,8 @@ public class TextModificationImpl extends MinimalEObjectImpl.Container implement String oldPattern = pattern; pattern = newPattern; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.TEXT_MODIFICATION__PATTERN, oldPattern, pattern)); - } } /** @@ -217,9 +215,7 @@ public class TextModificationImpl extends MinimalEObjectImpl.Container implement public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (pattern: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java index f22594d67d..74a532f3ee 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TextModifyTaskImpl.java @@ -113,9 +113,7 @@ public class TextModifyTaskImpl extends SetupTaskImpl implements TextModifyTask String oldUrl = url; url = newUrl; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.TEXT_MODIFY_TASK__URL, oldUrl, url)); - } } /** @@ -236,9 +234,7 @@ public class TextModifyTaskImpl extends SetupTaskImpl implements TextModifyTask public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (url: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java index 006aa871c3..b4b4f682cc 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java @@ -108,10 +108,10 @@ public class WorkingSetTaskImpl extends SetupTaskImpl implements WorkingSetTask } /** - * <!-- begin-user-doc --> + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated - */ + * @generated + */ @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java index 097e50cb58..32ca778a71 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupAdapterFactory.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.releng.setup.util; import org.eclipse.emf.cdo.releng.setup.ApiBaselineTask; import org.eclipse.emf.cdo.releng.setup.Branch; import org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask; +import org.eclipse.emf.cdo.releng.setup.CommandParameter; import org.eclipse.emf.cdo.releng.setup.CompoundSetupTask; import org.eclipse.emf.cdo.releng.setup.ConfigurableItem; import org.eclipse.emf.cdo.releng.setup.Configuration; @@ -21,6 +22,7 @@ import org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask; import org.eclipse.emf.cdo.releng.setup.EclipseVersion; import org.eclipse.emf.cdo.releng.setup.GitCloneTask; import org.eclipse.emf.cdo.releng.setup.InstallableUnit; +import org.eclipse.emf.cdo.releng.setup.KeyBindingTask; import org.eclipse.emf.cdo.releng.setup.LinkLocationTask; import org.eclipse.emf.cdo.releng.setup.OneTimeSetupTask; import org.eclipse.emf.cdo.releng.setup.P2Repository; @@ -255,6 +257,18 @@ public class SetupAdapterFactory extends AdapterFactoryImpl } @Override + public Adapter caseKeyBindingTask(KeyBindingTask object) + { + return createKeyBindingTaskAdapter(); + } + + @Override + public Adapter caseCommandParameter(CommandParameter object) + { + return createCommandParameterAdapter(); + } + + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -516,11 +530,41 @@ public class SetupAdapterFactory extends AdapterFactoryImpl } /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.setup.KeyBindingTask <em>Key Binding Task</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.releng.setup.KeyBindingTask + * @generated + */ + public Adapter createKeyBindingTaskAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.setup.CommandParameter <em>Command Parameter</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.releng.setup.CommandParameter + * @generated + */ + public Adapter createCommandParameterAdapter() + { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.setup.EclipseIniTask <em>Eclipse Ini Task</em>}'. * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> * @return the new adapter. * @see org.eclipse.emf.cdo.releng.setup.EclipseIniTask * @generated diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java index 50059e336e..47d21fdde4 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/util/SetupSwitch.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.releng.setup.util; import org.eclipse.emf.cdo.releng.setup.ApiBaselineTask; import org.eclipse.emf.cdo.releng.setup.Branch; import org.eclipse.emf.cdo.releng.setup.BuckminsterImportTask; +import org.eclipse.emf.cdo.releng.setup.CommandParameter; import org.eclipse.emf.cdo.releng.setup.CompoundSetupTask; import org.eclipse.emf.cdo.releng.setup.ConfigurableItem; import org.eclipse.emf.cdo.releng.setup.Configuration; @@ -21,6 +22,7 @@ import org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask; import org.eclipse.emf.cdo.releng.setup.EclipseVersion; import org.eclipse.emf.cdo.releng.setup.GitCloneTask; import org.eclipse.emf.cdo.releng.setup.InstallableUnit; +import org.eclipse.emf.cdo.releng.setup.KeyBindingTask; import org.eclipse.emf.cdo.releng.setup.LinkLocationTask; import org.eclipse.emf.cdo.releng.setup.OneTimeSetupTask; import org.eclipse.emf.cdo.releng.setup.P2Repository; @@ -124,17 +126,11 @@ public class SetupSwitch<T> EclipseVersion eclipseVersion = (EclipseVersion)theEObject; T result = caseEclipseVersion(eclipseVersion); if (result == null) - { result = caseConfigurableItem(eclipseVersion); - } if (result == null) - { result = caseSetupTaskContainer(eclipseVersion); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.CONFIGURATION: @@ -142,9 +138,7 @@ public class SetupSwitch<T> Configuration configuration = (Configuration)theEObject; T result = caseConfiguration(configuration); if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.CONFIGURABLE_ITEM: @@ -152,13 +146,9 @@ public class SetupSwitch<T> ConfigurableItem configurableItem = (ConfigurableItem)theEObject; T result = caseConfigurableItem(configurableItem); if (result == null) - { result = caseSetupTaskContainer(configurableItem); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.PROJECT: @@ -166,17 +156,11 @@ public class SetupSwitch<T> Project project = (Project)theEObject; T result = caseProject(project); if (result == null) - { result = caseConfigurableItem(project); - } if (result == null) - { result = caseSetupTaskContainer(project); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.BRANCH: @@ -184,17 +168,11 @@ public class SetupSwitch<T> Branch branch = (Branch)theEObject; T result = caseBranch(branch); if (result == null) - { result = caseConfigurableItem(branch); - } if (result == null) - { result = caseSetupTaskContainer(branch); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.PREFERENCES: @@ -202,13 +180,9 @@ public class SetupSwitch<T> Preferences preferences = (Preferences)theEObject; T result = casePreferences(preferences); if (result == null) - { result = caseSetupTaskContainer(preferences); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.SETUP: @@ -216,9 +190,7 @@ public class SetupSwitch<T> Setup setup = (Setup)theEObject; T result = caseSetup(setup); if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.SETUP_TASK: @@ -226,9 +198,7 @@ public class SetupSwitch<T> SetupTask setupTask = (SetupTask)theEObject; T result = caseSetupTask(setupTask); if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.SETUP_TASK_CONTAINER: @@ -236,9 +206,7 @@ public class SetupSwitch<T> SetupTaskContainer setupTaskContainer = (SetupTaskContainer)theEObject; T result = caseSetupTaskContainer(setupTaskContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.COMPOUND_SETUP_TASK: @@ -246,17 +214,11 @@ public class SetupSwitch<T> CompoundSetupTask compoundSetupTask = (CompoundSetupTask)theEObject; T result = caseCompoundSetupTask(compoundSetupTask); if (result == null) - { result = caseSetupTask(compoundSetupTask); - } if (result == null) - { result = caseSetupTaskContainer(compoundSetupTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.ONE_TIME_SETUP_TASK: @@ -264,13 +226,9 @@ public class SetupSwitch<T> OneTimeSetupTask oneTimeSetupTask = (OneTimeSetupTask)theEObject; T result = caseOneTimeSetupTask(oneTimeSetupTask); if (result == null) - { result = caseSetupTask(oneTimeSetupTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.ECLIPSE_INI_TASK: @@ -278,13 +236,9 @@ public class SetupSwitch<T> EclipseIniTask eclipseIniTask = (EclipseIniTask)theEObject; T result = caseEclipseIniTask(eclipseIniTask); if (result == null) - { result = caseSetupTask(eclipseIniTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.LINK_LOCATION_TASK: @@ -292,13 +246,9 @@ public class SetupSwitch<T> LinkLocationTask linkLocationTask = (LinkLocationTask)theEObject; T result = caseLinkLocationTask(linkLocationTask); if (result == null) - { result = caseSetupTask(linkLocationTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.P2_TASK: @@ -306,13 +256,9 @@ public class SetupSwitch<T> P2Task p2Task = (P2Task)theEObject; T result = caseP2Task(p2Task); if (result == null) - { result = caseSetupTask(p2Task); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.INSTALLABLE_UNIT: @@ -320,9 +266,7 @@ public class SetupSwitch<T> InstallableUnit installableUnit = (InstallableUnit)theEObject; T result = caseInstallableUnit(installableUnit); if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.P2_REPOSITORY: @@ -330,9 +274,7 @@ public class SetupSwitch<T> P2Repository p2Repository = (P2Repository)theEObject; T result = caseP2Repository(p2Repository); if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.BUCKMINSTER_IMPORT_TASK: @@ -340,13 +282,9 @@ public class SetupSwitch<T> BuckminsterImportTask buckminsterImportTask = (BuckminsterImportTask)theEObject; T result = caseBuckminsterImportTask(buckminsterImportTask); if (result == null) - { result = caseSetupTask(buckminsterImportTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.API_BASELINE_TASK: @@ -354,13 +292,9 @@ public class SetupSwitch<T> ApiBaselineTask apiBaselineTask = (ApiBaselineTask)theEObject; T result = caseApiBaselineTask(apiBaselineTask); if (result == null) - { result = caseSetupTask(apiBaselineTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.GIT_CLONE_TASK: @@ -368,13 +302,9 @@ public class SetupSwitch<T> GitCloneTask gitCloneTask = (GitCloneTask)theEObject; T result = caseGitCloneTask(gitCloneTask); if (result == null) - { result = caseSetupTask(gitCloneTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.ECLIPSE_PREFERENCE_TASK: @@ -382,13 +312,9 @@ public class SetupSwitch<T> EclipsePreferenceTask eclipsePreferenceTask = (EclipsePreferenceTask)theEObject; T result = caseEclipsePreferenceTask(eclipsePreferenceTask); if (result == null) - { result = caseSetupTask(eclipsePreferenceTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.STRING_VARIABLE_TASK: @@ -396,13 +322,9 @@ public class SetupSwitch<T> StringVariableTask stringVariableTask = (StringVariableTask)theEObject; T result = caseStringVariableTask(stringVariableTask); if (result == null) - { result = caseSetupTask(stringVariableTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.WORKING_SET_TASK: @@ -410,13 +332,9 @@ public class SetupSwitch<T> WorkingSetTask workingSetTask = (WorkingSetTask)theEObject; T result = caseWorkingSetTask(workingSetTask); if (result == null) - { result = caseSetupTask(workingSetTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.RESOURCE_COPY_TASK: @@ -424,13 +342,9 @@ public class SetupSwitch<T> ResourceCopyTask resourceCopyTask = (ResourceCopyTask)theEObject; T result = caseResourceCopyTask(resourceCopyTask); if (result == null) - { result = caseSetupTask(resourceCopyTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.TEXT_MODIFY_TASK: @@ -438,13 +352,9 @@ public class SetupSwitch<T> TextModifyTask textModifyTask = (TextModifyTask)theEObject; T result = caseTextModifyTask(textModifyTask); if (result == null) - { result = caseSetupTask(textModifyTask); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case SetupPackage.TEXT_MODIFICATION: @@ -452,9 +362,25 @@ public class SetupSwitch<T> TextModification textModification = (TextModification)theEObject; T result = caseTextModification(textModification); if (result == null) - { result = defaultCase(theEObject); - } + return result; + } + case SetupPackage.KEY_BINDING_TASK: + { + KeyBindingTask keyBindingTask = (KeyBindingTask)theEObject; + T result = caseKeyBindingTask(keyBindingTask); + if (result == null) + result = caseSetupTask(keyBindingTask); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case SetupPackage.COMMAND_PARAMETER: + { + CommandParameter commandParameter = (CommandParameter)theEObject; + T result = caseCommandParameter(commandParameter); + if (result == null) + result = defaultCase(theEObject); return result; } default: @@ -767,11 +693,43 @@ public class SetupSwitch<T> } /** + * Returns the result of interpreting the object as an instance of '<em>Key Binding Task</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Key Binding Task</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseKeyBindingTask(KeyBindingTask object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Command Parameter</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Command Parameter</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCommandParameter(CommandParameter object) + { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>Eclipse Ini Task</em>'. * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Eclipse Ini Task</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) |
