diff options
| author | sbouchet | 2012-05-29 09:30:32 +0000 |
|---|---|---|
| committer | sbouchet | 2012-05-29 09:30:32 +0000 |
| commit | 405f8cb363b7476d9b86db16b8d3906ccad09776 (patch) | |
| tree | 1f4e1308bbb9c40285e77292c0d77b0120e25a0c | |
| parent | 7b38992e7c643e2aabb1ea25015eed8a699f4c8c (diff) | |
| download | org.eclipse.eef-405f8cb363b7476d9b86db16b8d3906ccad09776.tar.gz org.eclipse.eef-405f8cb363b7476d9b86db16b8d3906ccad09776.tar.xz org.eclipse.eef-405f8cb363b7476d9b86db16b8d3906ccad09776.zip | |
working on modelingBot
143 files changed, 1193 insertions, 1459 deletions
diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/.gitignore b/plugins/org.eclipse.emf.eef.modelingbot.edit/.gitignore index ba077a403..4058d0f36 100644 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/.gitignore +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/.gitignore @@ -1 +1,2 @@ bin +/target diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.modelingbot.edit/META-INF/MANIFEST.MF index 07c5e5dd4..df5f079be 100644 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.eef.modelingbot.edit;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.eef.modelingBot.provider.MbotEditPlugin$Implementation Bundle-Vendor: %providerName @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.eef.modelingBot.EEFActions.provider, org.eclipse.emf.eef.modelingBot.EclipseActions.provider, - org.eclipse.emf.eef.modelingBot.edit.actions, + org.eclipse.emf.eef.modelingBot.edit.commands, org.eclipse.emf.eef.modelingBot.provider Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.eef.modelingbot;visibility:=reexport, diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/build.properties b/plugins/org.eclipse.emf.eef.modelingbot.edit/build.properties index 6aa4459cc..85da56404 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/build.properties +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/build.properties @@ -8,12 +8,6 @@ # Contributors: # Obeo - initial API and implementation ############################################################################### - -# <copyright> -# </copyright> -# -# $Id: build.properties,v 1.2 2011/04/07 15:59:05 nlepine Exp $ - bin.includes = .,\ icons/,\ META-INF/,\ diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/icons/sample.gif b/plugins/org.eclipse.emf.eef.modelingbot.edit/icons/sample.gif Binary files differdeleted file mode 100644 index 34fb3c9d8..000000000 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/icons/sample.gif +++ /dev/null diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.properties b/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.properties index 612ccf136..f833aeb67 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.properties +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.properties @@ -9,11 +9,6 @@ # Obeo - initial API and implementation ############################################################################### -# <copyright> -# </copyright> -# -# $Id: plugin.properties,v 1.7 2011/04/13 21:31:27 glefur Exp $ - pluginName = Mbot Edit Support providerName = www.example.org @@ -103,7 +98,7 @@ _UI_SetReference_eContainingFeature_feature = EContaining Feature - +_UI_Wizard_category = EMF Editing Framework _UI_BrowseRegisteredPackages_label = Browse &Registered Packages... _UI_SelectRegisteredPackageURI = &Select a registered package URI: _UI_PackageSelection_label = Package Selection @@ -111,12 +106,12 @@ _UI_DevelopmentTimeVersion_label = &Development Time Version _UI_RuntimeVersion_label = &Runtime Version _UI_EEFActionsModelWizard_label = EMF Model _UI_EEFActionsModelWizard_description = Create a new model file from any Metamodel ... +_UI_ModelCreationMetamodelSelection_description = Create a new model file from any Metamodel ... _UI_Wizard_label = New _UI_ModelingBotEditorFilenameDefaultBase = My _UI_ModelObject = &Model Object _UI_XMLEncoding = &XML Encoding _UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1 _UI_Wizard_initial_object_description = Select a model object to create -_UI_EEFActionsModelWizard_label = EMF Model -_UI_ModelCreationMetamodelSelection_description = Create a new model file from any Metamodel ... _UI_OpenEditorError_label = Open Editor +_UI_Wizard_referenceableObject_feature = Referenceable Object diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.xml b/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.xml index ba18f2808..0e20fe03c 100644 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.xml +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/plugin.xml @@ -20,9 +20,6 @@ org.eclipse.emf.edit.provider.ITreeItemContentProvider org.eclipse.emf.edit.provider.IItemLabelProvider org.eclipse.emf.edit.provider.IItemPropertySource"/> - </extension> - - <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories"> <factory uri="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0" class="org.eclipse.emf.eef.modelingBot.EEFActions.provider.EEFActionsItemProviderAdapterFactory" @@ -32,9 +29,6 @@ org.eclipse.emf.edit.provider.ITreeItemContentProvider org.eclipse.emf.edit.provider.IItemLabelProvider org.eclipse.emf.edit.provider.IItemPropertySource"/> - </extension> - - <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories"> <factory uri="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" class="org.eclipse.emf.eef.modelingBot.EclipseActions.provider.EclipseActionsItemProviderAdapterFactory" @@ -45,29 +39,11 @@ org.eclipse.emf.edit.provider.IItemLabelProvider org.eclipse.emf.edit.provider.IItemPropertySource"/> </extension> - <extension - point="org.eclipse.ui.popupMenus"> - <objectContribution - id="org.eclipse.emf.eef.modelingbot.edit.contribution1" - objectClass="org.eclipse.core.resources.IFile"> - <menu - id="org.eclipse.emf.eef.modelingbot.edit.menu1" - label="EEF" - path="additions"> - <separator - name="group1"> - </separator> - </menu> - <action - class="org.eclipse.emf.eef.modelingBot.edit.actions.OpenWithEEFAction" - enablesFor="1" - id="org.eclipse.emf.eef.modelingbot.edit.newAction" - label="Open With Interactive EEF Editor" - menubarPath="org.eclipse.emf.eef.modelingbot.edit.menu1/group1"> - </action> - </objectContribution> - </extension> + <extension point="org.eclipse.ui.newWizards"> + <category + id="org.eclipse.emf.eef.ui.category" + name="%_UI_Wizard_category"/> <wizard id="org.eclipse.emf.eef.modelingBot.EEFActions.presentation.EEFActionsModelWizardID" name="%_UI_EEFActionsModelWizard_label" @@ -78,5 +54,49 @@ <selection class="org.eclipse.core.resources.IResource"/> </wizard> </extension> - + + <extension + point="org.eclipse.ui.commands"> + <command + defaultHandler="org.eclipse.emf.eef.modelingBot.edit.commands.OpenWithEEFHandler" + id="org.eclipse.emf.eef.modelingbot.commmands.openWithEEF" + name="Open With Interactive EEF Editor"> + </command> + </extension> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + locationURI="popup:org.eclipse.ui.popup.any?after=additions"> + <command + commandId="org.eclipse.emf.eef.modelingbot.commmands.openWithEEF" + style="push"> + </command> + </menuContribution> + </extension> + <extension + point="org.eclipse.ui.handlers"> + <handler + class="org.eclipse.emf.eef.modelingBot.edit.commands.OpenWithEEFHandler" + commandId="org.eclipse.emf.eef.modelingbot.commmands.openWithEEF"> + <activeWhen> + <with + variable="selection"> + <iterate + operator="or"> + <instanceof + value="org.eclipse.core.resources.IFile"> + </instanceof> + </iterate> + </with> + </activeWhen> + <enabledWhen> + <with + variable="selection"> + <count + value="1"> + </count> + </with> + </enabledWhen> + </handler> +</extension> </plugin> diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ActionItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ActionItemProvider.java index 8fcea3098..8fcea3098 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ActionItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ActionItemProvider.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DetailsPageItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DetailsPageItemProvider.java index a69f6dcb2..a69f6dcb2 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DetailsPageItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DetailsPageItemProvider.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DocumentedElementItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DocumentedElementItemProvider.java index 1a511b8cf..1a511b8cf 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DocumentedElementItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/DocumentedElementItemProvider.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/MbotEditPlugin.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/MbotEditPlugin.java index d1a2ab20f..001ae3158 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/MbotEditPlugin.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/MbotEditPlugin.java @@ -28,36 +28,34 @@ import org.eclipse.emf.eef.views.provider.ViewsEditPlugin; /** * This is the central singleton for the Mbot edit plugin. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public final class MbotEditPlugin extends EMFPlugin { /** * Keep track of the singleton. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static final MbotEditPlugin INSTANCE = new MbotEditPlugin(); /** - * EEF Editor ID + * EEF Editor ID + * + * @generated NOT */ public static final String INTERACTIVE_EEF_EDITOR_ID = "org.eclipse.emf.eef.runtime.ui.editor.InteractiveEEFEditorID"; /** * Keep track of the singleton. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ private static Implementation plugin; /** * Create the instance. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public MbotEditPlugin() { @@ -74,8 +72,7 @@ public final class MbotEditPlugin extends EMFPlugin { /** * Returns the singleton instance of the Eclipse plugin. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the singleton instance. * @generated */ @@ -86,8 +83,7 @@ public final class MbotEditPlugin extends EMFPlugin { /** * Returns the singleton instance of the Eclipse plugin. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the singleton instance. * @generated */ @@ -97,15 +93,13 @@ public final class MbotEditPlugin extends EMFPlugin { /** * The actual implementation of the Eclipse <b>Plugin</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static class Implementation extends EclipsePlugin { /** * Creates an instance. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Implementation() { diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProvider.java index 2be4c6040..2be4c6040 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProvider.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProviderAdapterFactory.java index 83e9a4988..83e9a4988 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ModelingBotItemProviderAdapterFactory.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/PropertiesViewItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/PropertiesViewItemProvider.java index fddeb9440..fddeb9440 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/PropertiesViewItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/PropertiesViewItemProvider.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ScenarioItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ScenarioItemProvider.java index f3f424856..f3f424856 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ScenarioItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/ScenarioItemProvider.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/SequenceItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/SequenceItemProvider.java index f382ff60b..f382ff60b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/SequenceItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/SequenceItemProvider.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/WizardItemProvider.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/WizardItemProvider.java index 3b9db1dcc..a2f9e7c6b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/WizardItemProvider.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src-gen/org/eclipse/emf/eef/modelingBot/provider/WizardItemProvider.java @@ -17,6 +17,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -24,6 +25,7 @@ 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.eef.modelingBot.ModelingBotPackage; import org.eclipse.emf.eef.modelingBot.Wizard; /** @@ -61,11 +63,34 @@ public class WizardItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addReferenceableObjectPropertyDescriptor(object); } return itemPropertyDescriptors; } /** + * This adds a property descriptor for the Referenceable Object feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addReferenceableObjectPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Wizard_referenceableObject_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_Wizard_referenceableObject_feature", "_UI_Wizard_type"), + ModelingBotPackage.Literals.WIZARD__REFERENCEABLE_OBJECT, + true, + false, + true, + null, + null, + null)); + } + + /** * This returns Wizard.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src/org/eclipse/emf/eef/modelingBot/edit/actions/OpenWithEEFAction.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src/org/eclipse/emf/eef/modelingBot/edit/actions/OpenWithEEFAction.java deleted file mode 100644 index 07084f441..000000000 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src/org/eclipse/emf/eef/modelingBot/edit/actions/OpenWithEEFAction.java +++ /dev/null @@ -1,69 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Obeo. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ -package org.eclipse.emf.eef.modelingBot.edit.actions; - -import org.eclipse.core.resources.IFile; -import org.eclipse.emf.eef.modelingBot.provider.MbotEditPlugin; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IActionDelegate; -import org.eclipse.ui.IObjectActionDelegate; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; - -public class OpenWithEEFAction implements IObjectActionDelegate { - - private Shell shell; - private IFile iFile; - - /** - * Constructor for Action1. - */ - public OpenWithEEFAction() { - super(); - } - - /** - * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart) - */ - public void setActivePart(IAction action, IWorkbenchPart targetPart) { - shell = targetPart.getSite().getShell(); - } - - /** - * @see IActionDelegate#run(IAction) - */ - public void run(IAction action) { - try { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(new FileEditorInput(iFile), MbotEditPlugin.INTERACTIVE_EEF_EDITOR_ID); - } catch (PartInitException e) { - - } - } - - /** - * @see IActionDelegate#selectionChanged(IAction, ISelection) - */ - public void selectionChanged(IAction action, ISelection selection) { - if (selection instanceof StructuredSelection) { - StructuredSelection sSel = (StructuredSelection) selection; - if (!sSel.isEmpty()) { - this.iFile = (IFile)sSel.getFirstElement(); - } - - } - } - -} diff --git a/plugins/org.eclipse.emf.eef.modelingbot.edit/src/org/eclipse/emf/eef/modelingBot/edit/wizards/ModelCreationWizard.java b/plugins/org.eclipse.emf.eef.modelingbot.edit/src/org/eclipse/emf/eef/modelingBot/edit/wizards/ModelCreationWizard.java index dc6296b33..89f0ca82e 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot.edit/src/org/eclipse/emf/eef/modelingBot/edit/wizards/ModelCreationWizard.java +++ b/plugins/org.eclipse.emf.eef.modelingbot.edit/src/org/eclipse/emf/eef/modelingBot/edit/wizards/ModelCreationWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Obeo. + * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,12 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -/** - * - */ package org.eclipse.emf.eef.modelingBot.edit.wizards; import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -88,14 +87,20 @@ import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.part.ISetSelectionTarget; /** + * The wizard for creating modelingBots models. + * * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a> - * */ public class ModelCreationWizard extends Wizard implements INewWizard { + private List<EClass> initialObjects = new ArrayList<EClass>(); + protected static final int CONTROL_OFFSET = 10; - private List<EClass> initialObjects = new ArrayList<EClass>(); + /** + * This is the metamodel selection page. + */ + private MetamodelSelectionWizardPage metamodelSelectionPage; /** * Remember the selection during initialization for populating the default container. @@ -113,11 +118,6 @@ public class ModelCreationWizard extends Wizard implements INewWizard { protected List<String> initialObjectNames; /** - * This is the metamodel selection page. - */ - private MetamodelSelectionWizardPage metamodelSelectionPage; - - /** * This is the file creation page. */ protected ModelCreationWizardNewFileCreationPage newFileCreationPage; @@ -128,107 +128,96 @@ public class ModelCreationWizard extends Wizard implements INewWizard { protected ModelingBotModelWizardInitialObjectCreationPage initialObjectCreationPage; /** - * ResourceSet to use + * ResourceSet to use. */ protected ResourceSet resourceSet = new ResourceSetImpl(); /** - * {@inheritDoc) + * {@inheritDoc} + * * @see org.eclipse.jface.wizard.Wizard#performFinish() */ @Override public boolean performFinish() { try { // Remember the file. - // final IFile modelFile = getModelFile(); // Do the work within an operation. - // - WorkspaceModifyOperation operation = - new WorkspaceModifyOperation() { - @Override - protected void execute(IProgressMonitor progressMonitor) { - try { - // Create a resource set - // - ResourceSet resourceSet = new ResourceSetImpl(); - - // Get the URI of the model file. - // - URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true); - - // Create a resource for this file. - // - Resource resource = resourceSet.createResource(fileURI); - - // Add the initial model object to the contents. - // - EObject rootObject = createInitialModel(); - if (rootObject != null) { - resource.getContents().add(rootObject); - } + final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { + @Override + protected void execute(IProgressMonitor progressMonitor) { + try { + // Create a resource set + final ResourceSet wResourceSet = new ResourceSetImpl(); - // Save the contents of the resource to the file system. - // - Map<Object, Object> options = new HashMap<Object, Object>(); - options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding()); - resource.save(options); - } - catch (Exception exception) { - MbotEditPlugin.INSTANCE.log(exception); - } - finally { - progressMonitor.done(); + // Get the URI of the model file. + final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true); + + // Create a resource for this file. + final Resource resource = wResourceSet.createResource(fileURI); + + // Add the initial model object to the contents. + final EObject rootObject = createInitialModel(); + if (rootObject != null) { + resource.getContents().add(rootObject); } + + // Save the contents of the resource to the file system. + final Map<Object, Object> options = new HashMap<Object, Object>(); + options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding()); + resource.save(options); + } catch (IOException exception) { + MbotEditPlugin.INSTANCE.log(exception); + } finally { + progressMonitor.done(); } - }; + } + }; getContainer().run(false, false, operation); // Select the new file resource in the current view. - // - IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow(); - IWorkbenchPage page = workbenchWindow.getActivePage(); + final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow(); + final IWorkbenchPage page = workbenchWindow.getActivePage(); final IWorkbenchPart activePart = page.getActivePart(); if (activePart instanceof ISetSelectionTarget) { final ISelection targetSelection = new StructuredSelection(modelFile); - getShell().getDisplay().asyncExec - (new Runnable() { - public void run() { - ((ISetSelectionTarget)activePart).selectReveal(targetSelection); - } - }); + getShell().getDisplay().asyncExec(new Runnable() { + public void run() { + ((ISetSelectionTarget)activePart).selectReveal(targetSelection); + } + }); } // Open an editor on the new file. - // try { - page.openEditor - (new FileEditorInput(modelFile), MbotEditPlugin.INTERACTIVE_EEF_EDITOR_ID); - } - catch (PartInitException exception) { - MessageDialog.openError(workbenchWindow.getShell(), MbotEditPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); - return false; + page.openEditor(new FileEditorInput(modelFile), MbotEditPlugin.INTERACTIVE_EEF_EDITOR_ID); + return true; + } catch (PartInitException exception) { + MessageDialog.openError(workbenchWindow.getShell(), + MbotEditPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); } - - return true; - } - catch (Exception exception) { + } catch (InterruptedException exception) { + MbotEditPlugin.INSTANCE.log(exception); + } catch (InvocationTargetException exception) { MbotEditPlugin.INSTANCE.log(exception); - return false; } + return false; } /** - * {@inheritDoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) + * {@inheritDoc} + * + * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, + * org.eclipse.jface.viewers.IStructuredSelection) */ public void init(IWorkbench workbench, IStructuredSelection selection) { this.workbench = workbench; this.selection = selection; setWindowTitle(MbotEditPlugin.INSTANCE.getString("_UI_Wizard_label")); - setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(MbotEditPlugin.INSTANCE.getImage("full/wizban/NewModelingBot"))); + setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(MbotEditPlugin.INSTANCE + .getImage("full/wizban/NewModelingBot"))); } /** @@ -242,8 +231,8 @@ public class ModelCreationWizard extends Wizard implements INewWizard { * Create a new model. */ protected EObject createInitialModel() { - EClass eClass = getEClassifier(initialObjectCreationPage.getInitialObjectName()); - EObject rootObject = EcoreUtil.create(eClass); + final EClass eClass = getEClassifier(initialObjectCreationPage.getInitialObjectName()); + final EObject rootObject = EcoreUtil.create(eClass); return rootObject; } @@ -270,13 +259,15 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } /** - * {@inheritDoc) + * {@inheritDoc} + * * @see org.eclipse.jface.wizard.Wizard#addPages() */ public void addPages() { metamodelSelectionPage = new MetamodelSelectionWizardPage("Whatever0"); metamodelSelectionPage.setTitle(MbotEditPlugin.INSTANCE.getString("_UI_EEFActionsModelWizard_label")); - metamodelSelectionPage.setDescription(MbotEditPlugin.INSTANCE.getString("_UI_ModelCreationMetamodelSelection_description")); + metamodelSelectionPage.setDescription(MbotEditPlugin.INSTANCE + .getString("_UI_ModelCreationMetamodelSelection_description")); addPage(metamodelSelectionPage); // Create a page, set the title, and the initial model file name. @@ -292,7 +283,7 @@ public class ModelCreationWizard extends Wizard implements INewWizard { if (selection != null && !selection.isEmpty()) { // Get the resource... // - Object selectedElement = selection.iterator().next(); + final Object selectedElement = selection.iterator().next(); if (selectedElement instanceof IResource) { // Get the resource parent, if its a file. // @@ -310,7 +301,8 @@ public class ModelCreationWizard extends Wizard implements INewWizard { // Make up a unique new name here. // - String defaultModelBaseFilename = MbotEditPlugin.INSTANCE.getString("_UI_ModelingBotEditorFilenameDefaultBase"); + final String defaultModelBaseFilename = MbotEditPlugin.INSTANCE + .getString("_UI_ModelingBotEditorFilenameDefaultBase"); String modelFilename = defaultModelBaseFilename; for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) { modelFilename = defaultModelBaseFilename + i; @@ -321,11 +313,11 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } initialObjectCreationPage = new ModelingBotModelWizardInitialObjectCreationPage("Whatever2"); initialObjectCreationPage.setTitle(MbotEditPlugin.INSTANCE.getString("_UI_EEFActionsModelWizard_label")); - initialObjectCreationPage.setDescription(MbotEditPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); + initialObjectCreationPage.setDescription(MbotEditPlugin.INSTANCE + .getString("_UI_Wizard_initial_object_description")); addPage(initialObjectCreationPage); } - private void updateObjectField() { initialObjectCreationPage.getInitialObjectField().removeAll(); for (String objectName : getInitialObjectNames()) { @@ -349,114 +341,88 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } /** - * {@inheritDoc) + * {@inheritDoc} + * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ public void createControl(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - { - FormLayout layout = new FormLayout(); - composite.setLayout(layout); - - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.grabExcessVerticalSpace = true; - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - if (!EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) - { - data.widthHint = 330; - } - composite.setLayoutData(data); + final Composite composite = new Composite(parent, SWT.NONE); + final FormLayout layout = new FormLayout(); + composite.setLayout(layout); + final GridData gData = new GridData(); + gData.verticalAlignment = GridData.FILL; + gData.grabExcessVerticalSpace = true; + gData.horizontalAlignment = GridData.FILL; + gData.grabExcessHorizontalSpace = true; + if (!EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) { + gData.widthHint = 330; } - + composite.setLayoutData(gData); // buttonComposite has to be the first child of composite because subclasses are expecting this. - Composite buttonComposite = new Composite(composite, SWT.NONE); - - Label resourceURILabel = new Label(composite, SWT.LEFT); - { - resourceURILabel.setText(CommonUIPlugin.INSTANCE.getString("_UI_ResourceURI_label")); - FormData data = new FormData(); - data.left = new FormAttachment(0, CONTROL_OFFSET); - data.top = new FormAttachment(0, CONTROL_OFFSET); - resourceURILabel.setLayoutData(data); - } - { - FormData data = new FormData(); - data.top = new FormAttachment(resourceURILabel, CONTROL_OFFSET, SWT.CENTER); - data.left = new FormAttachment(resourceURILabel, CONTROL_OFFSET); - data.right = new FormAttachment(100, -CONTROL_OFFSET); - buttonComposite.setLayoutData(data); - - buttonComposite.setLayout(new FormLayout()); - } - + final Composite buttonComposite = new Composite(composite, SWT.NONE); + + final Label resourceURILabel = new Label(composite, SWT.LEFT); + resourceURILabel.setText(CommonUIPlugin.INSTANCE.getString("_UI_ResourceURI_label")); + FormData fData = new FormData(); + fData.left = new FormAttachment(0, CONTROL_OFFSET); + fData.top = new FormAttachment(0, CONTROL_OFFSET); + resourceURILabel.setLayoutData(fData); + fData = new FormData(); + fData.top = new FormAttachment(resourceURILabel, CONTROL_OFFSET, SWT.CENTER); + fData.left = new FormAttachment(resourceURILabel, CONTROL_OFFSET); + fData.right = new FormAttachment(100, -CONTROL_OFFSET); + buttonComposite.setLayoutData(fData); + buttonComposite.setLayout(new FormLayout()); uriField = new Text(composite, SWT.BORDER); - { - FormData data = new FormData(); - data.top = new FormAttachment(buttonComposite, CONTROL_OFFSET); - data.left = new FormAttachment(0, CONTROL_OFFSET); - data.right = new FormAttachment(100, -CONTROL_OFFSET); - uriField.setLayoutData(data); - uriField.addModifyListener(new ModifyListener() { - - public void modifyText(ModifyEvent e) { - updateMetamodel(); - setPageComplete(validatePage()); - } - - }); - } + fData = new FormData(); + fData.top = new FormAttachment(buttonComposite, CONTROL_OFFSET); + fData.left = new FormAttachment(0, CONTROL_OFFSET); + fData.right = new FormAttachment(100, -CONTROL_OFFSET); + uriField.setLayoutData(fData); + uriField.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + updateMetamodel(); + setPageComplete(validatePage()); + } - Button browseFileSystemButton = new Button(buttonComposite, SWT.PUSH); + }); + final Button browseFileSystemButton = new Button(buttonComposite, SWT.PUSH); browseFileSystemButton.setText(CommonUIPlugin.INSTANCE.getString("_UI_BrowseFileSystem_label")); prepareBrowseFileSystemButton(browseFileSystemButton); - if (EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) - { - Button browseWorkspaceButton = new Button(buttonComposite, SWT.PUSH); - { - FormData data = new FormData(); - data.right = new FormAttachment(100); - browseWorkspaceButton.setLayoutData(data); - } - { - FormData data = new FormData(); - data.right = new FormAttachment(browseWorkspaceButton, -CONTROL_OFFSET); - browseFileSystemButton.setLayoutData(data); - } + if (EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) { + final Button browseWorkspaceButton = new Button(buttonComposite, SWT.PUSH); + fData = new FormData(); + fData.right = new FormAttachment(100); + browseWorkspaceButton.setLayoutData(fData); + fData = new FormData(); + fData.right = new FormAttachment(browseWorkspaceButton, -CONTROL_OFFSET); + browseFileSystemButton.setLayoutData(fData); browseWorkspaceButton.setText(CommonUIPlugin.INSTANCE.getString("_UI_BrowseWorkspace_label")); prepareBrowseWorkspaceButton(browseWorkspaceButton); - } - else - { - FormData data = new FormData(); - data.right = new FormAttachment(100); - browseFileSystemButton.setLayoutData(data); + } else { + fData = new FormData(); + fData.right = new FormAttachment(100); + browseFileSystemButton.setLayoutData(fData); } - Label separatorLabel = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL); - { - FormData data = new FormData(); - data.top = new FormAttachment(uriField, (int)(1.5*CONTROL_OFFSET)); - data.left = new FormAttachment(0, -CONTROL_OFFSET); - data.right = new FormAttachment(100, CONTROL_OFFSET); - separatorLabel.setLayoutData(data); - } - - composite.setTabList(new Control[]{uriField, buttonComposite}); - Button browseRegisteredPackagesButton = new Button(buttonComposite, SWT.PUSH); - browseRegisteredPackagesButton.setText(MbotEditPlugin.INSTANCE.getString("_UI_BrowseRegisteredPackages_label")); + final Label separatorLabel = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL); + fData = new FormData(); + fData.top = new FormAttachment(uriField, (int)(1.5 * CONTROL_OFFSET)); + fData.left = new FormAttachment(0, -CONTROL_OFFSET); + fData.right = new FormAttachment(100, CONTROL_OFFSET); + separatorLabel.setLayoutData(fData); + composite.setTabList(new Control[] {uriField, buttonComposite}); + final Button browseRegisteredPackagesButton = new Button(buttonComposite, SWT.PUSH); + browseRegisteredPackagesButton.setText(MbotEditPlugin.INSTANCE + .getString("_UI_BrowseRegisteredPackages_label")); prepareBrowseRegisteredPackagesButton(browseRegisteredPackagesButton); - { - FormData data = new FormData(); - Control [] children = buttonComposite.getChildren(); - data.left = new FormAttachment(0, 0); - data.right = new FormAttachment(children[0], -CONTROL_OFFSET); - browseRegisteredPackagesButton.setLayoutData(data); - } - - + fData = new FormData(); + Control[] children = buttonComposite.getChildren(); + fData.left = new FormAttachment(0, 0); + fData.right = new FormAttachment(children[0], -CONTROL_OFFSET); + browseRegisteredPackagesButton.setLayoutData(fData); setControl(composite); setPageComplete(validatePage()); } @@ -466,24 +432,23 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } private void updateMetamodel() { - List<URI> uris = new ArrayList<URI>(); - for (StringTokenizer stringTokenizer = new StringTokenizer(getURIText()); stringTokenizer.hasMoreTokens(); ) - { - String uri = stringTokenizer.nextToken(); + final List<URI> uris = new ArrayList<URI>(); + for (StringTokenizer stringTokenizer = new StringTokenizer(getURIText()); stringTokenizer.hasMoreTokens();) { + final String uri = stringTokenizer.nextToken(); uris.add(URI.createURI(uri)); } - List<EClass> newInitialObjects = new ArrayList<EClass>(); + final List<EClass> newInitialObjects = new ArrayList<EClass>(); for (URI uri : uris) { try { - Resource resource = resourceSet.getResource(uri, true); + final Resource resource = resourceSet.getResource(uri, true); if (resource.getContents() != null) { - List<EClass> allClasses = getAllClasses(resource); + final List<EClass> allClasses = getAllClasses(resource); if (!allClasses.isEmpty()) { newInitialObjects.addAll(allClasses); } } } catch (Exception e) { - //Silent catch malformed protocol + // Silent catch malformed protocol } } if (!newInitialObjects.isEmpty()) { @@ -494,11 +459,11 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } private List<EClass> getAllClasses(Resource resource) { - List<EClass> eclasses = new ArrayList<EClass>(); + final List<EClass> eclasses = new ArrayList<EClass>(); for (Iterator<?> iterator = resource.getAllContents(); iterator.hasNext();) { - Object next = iterator.next(); + final Object next = iterator.next(); if (next instanceof EClass) { - eclasses.add((EClass) next); + eclasses.add((EClass)next); } } return eclasses; @@ -509,24 +474,19 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } /** - * Called to prepare the Browse File System button, this implementation adds a selection listener - * that creates an appropriate {@link FileDialog}. + * Called to prepare the Browse File System button, this implementation adds a selection listener that + * creates an appropriate {@link FileDialog}. */ - protected void prepareBrowseFileSystemButton(Button browseFileSystemButton) - { - browseFileSystemButton.addSelectionListener - (new SelectionAdapter() - { + protected void prepareBrowseFileSystemButton(Button browseFileSystemButton) { + browseFileSystemButton.addSelectionListener(new SelectionAdapter() { @Override - public void widgetSelected(SelectionEvent event) - { - FileDialog fileDialog = new FileDialog(getShell(), SWT.NONE); + public void widgetSelected(SelectionEvent event) { + final FileDialog fileDialog = new FileDialog(getShell(), SWT.NONE); fileDialog.open(); - String filterPath = fileDialog.getFilterPath(); - String fileName = fileDialog.getFileName(); - if (fileName != null) - { + final String filterPath = fileDialog.getFilterPath(); + final String fileName = fileDialog.getFileName(); + if (fileName != null) { uriField.setText(URI.createFileURI(filterPath + File.separator + fileName).toString()); } } @@ -534,63 +494,49 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } /** - * Called to prepare the Browse Workspace button, this implementation adds a selection listener - * that creates an appropriate {@link WorkspaceResourceDialog}. + * Called to prepare the Browse Workspace button, this implementation adds a selection listener that + * creates an appropriate {@link WorkspaceResourceDialog}. */ - protected void prepareBrowseWorkspaceButton(Button browseWorkspaceButton) - { - browseWorkspaceButton.addSelectionListener - (new SelectionAdapter() - { + protected void prepareBrowseWorkspaceButton(Button browseWorkspaceButton) { + browseWorkspaceButton.addSelectionListener(new SelectionAdapter() { @Override - public void widgetSelected(SelectionEvent event) - { + public void widgetSelected(SelectionEvent event) { IFile file = null; - IFile[] files = WorkspaceResourceDialog.openFileSelection(getShell(), null, null, false, null, null); - if (files.length != 0) - { + final IFile[] files = WorkspaceResourceDialog.openFileSelection(getShell(), null, null, false, + null, null); + if (files.length != 0) { file = files[0]; } - if (file != null) - { + if (file != null) { uriField.setText(URI.createPlatformResourceURI(file.getFullPath().toString(), true).toString()); } } - }); + }); } - protected void prepareBrowseRegisteredPackagesButton(Button browseRegisteredPackagesButton) - { - browseRegisteredPackagesButton.addSelectionListener - (new SelectionAdapter() - { + protected void prepareBrowseRegisteredPackagesButton(Button browseRegisteredPackagesButton) { + browseRegisteredPackagesButton.addSelectionListener(new SelectionAdapter() { @Override - public void widgetSelected(SelectionEvent event) - { - RegisteredPackageDialog registeredPackageDialog = new RegisteredPackageDialog(getShell()); + public void widgetSelected(SelectionEvent event) { + final RegisteredPackageDialog registeredPackageDialog = new RegisteredPackageDialog(getShell()); registeredPackageDialog.open(); - Object [] result = registeredPackageDialog.getResult(); - if (result != null) - { - List<?> nsURIs = Arrays.asList(result); - if (registeredPackageDialog.isDevelopmentTimeVersion()) - { - ResourceSet resourceSet = new ResourceSetImpl(); + final Object[] result = registeredPackageDialog.getResult(); + if (result != null) { + final List<?> nsURIs = Arrays.asList(result); + if (registeredPackageDialog.isDevelopmentTimeVersion()) { + final ResourceSet resourceSet = new ResourceSetImpl(); resourceSet.getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap()); - StringBuffer uris = new StringBuffer(); - Map<String, URI> ePackageNsURItoGenModelLocationMap = EcorePlugin.getEPackageNsURIToGenModelLocationMap(); - for (int i = 0, length = result.length; i < length; i++) - { - URI location = ePackageNsURItoGenModelLocationMap.get(result[i]); - Resource resource = resourceSet.getResource(location, true); + final StringBuffer uris = new StringBuffer(); + final Map<String, URI> ePackageNsURItoGenModelLocationMap = EcorePlugin + .getEPackageNsURIToGenModelLocationMap(); + for (int i = 0, length = result.length; i < length; i++) { + final URI location = ePackageNsURItoGenModelLocationMap.get(result[i]); + final Resource resource = resourceSet.getResource(location, true); EcoreUtil.resolveAll(resource); } - for (Resource resource : resourceSet.getResources()) - { - for (EPackage ePackage : getAllPackages(resource)) - { - if (nsURIs.contains(ePackage.getNsURI())) - { + for (Resource resource : resourceSet.getResources()) { + for (EPackage ePackage : getAllPackages(resource)) { + if (nsURIs.contains(ePackage.getNsURI())) { uris.append(resource.getURI()); uris.append(" "); break; @@ -598,12 +544,9 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } } uriField.setText((uriField.getText() + " " + uris.toString()).trim()); - } - else - { - StringBuffer uris = new StringBuffer(); - for (int i = 0, length = result.length; i < length; i++) - { + } else { + final StringBuffer uris = new StringBuffer(); + for (int i = 0, length = result.length; i < length; i++) { uris.append(result[i]); uris.append(" "); } @@ -611,31 +554,22 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } } } - }); + }); } - protected Collection<EPackage> getAllPackages(Resource resource) - { - List<EPackage> result = new ArrayList<EPackage>(); - for (TreeIterator<?> j = - new EcoreUtil.ContentTreeIterator<Object>(resource.getContents()) - { + protected Collection<EPackage> getAllPackages(Resource resource) { + final List<EPackage> result = new ArrayList<EPackage>(); + for (TreeIterator<?> j = new EcoreUtil.ContentTreeIterator<Object>(resource.getContents()) { private static final long serialVersionUID = 1L; @Override - protected Iterator<? extends EObject> getEObjectChildren(EObject eObject) - { - return - eObject instanceof EPackage ? - ((EPackage)eObject).getESubpackages().iterator() : - Collections.<EObject>emptyList().iterator(); + protected Iterator<? extends EObject> getEObjectChildren(EObject eObject) { + return eObject instanceof EPackage ? ((EPackage)eObject).getESubpackages().iterator() : Collections + .<EObject> emptyList().iterator(); } - }; - j.hasNext(); ) - { - Object content = j.next(); - if (content instanceof EPackage) - { + }; j.hasNext();) { + final Object content = j.next(); + if (content instanceof EPackage) { result.add((EPackage)content); } } @@ -643,8 +577,6 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } } - - /** * This is the one page of the wizard. */ @@ -683,55 +615,39 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } public void createControl(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); { - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - layout.verticalSpacing = 12; - composite.setLayout(layout); - - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.grabExcessVerticalSpace = true; - data.horizontalAlignment = GridData.FILL; - composite.setLayoutData(data); - } - - Label containerLabel = new Label(composite, SWT.LEFT); - { - containerLabel.setText(MbotEditPlugin.INSTANCE.getString("_UI_ModelObject")); - - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - containerLabel.setLayoutData(data); - } - + final Composite composite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + layout.verticalSpacing = 12; + composite.setLayout(layout); + GridData gData = new GridData(); + gData.verticalAlignment = GridData.FILL; + gData.grabExcessVerticalSpace = true; + gData.horizontalAlignment = GridData.FILL; + composite.setLayoutData(gData); + final Label containerLabel = new Label(composite, SWT.LEFT); + containerLabel.setText(MbotEditPlugin.INSTANCE.getString("_UI_ModelObject")); + gData = new GridData(); + gData.horizontalAlignment = GridData.FILL; + containerLabel.setLayoutData(gData); initialObjectField = new Combo(composite, SWT.BORDER); - { - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - initialObjectField.setLayoutData(data); - } - + gData = new GridData(); + gData.horizontalAlignment = GridData.FILL; + gData.grabExcessHorizontalSpace = true; + initialObjectField.setLayoutData(gData); updateObjectField(); initialObjectField.addModifyListener(validator); - Label encodingLabel = new Label(composite, SWT.LEFT); - { - encodingLabel.setText(MbotEditPlugin.INSTANCE.getString("_UI_XMLEncoding")); - - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - encodingLabel.setLayoutData(data); - } + final Label encodingLabel = new Label(composite, SWT.LEFT); + encodingLabel.setText(MbotEditPlugin.INSTANCE.getString("_UI_XMLEncoding")); + gData = new GridData(); + gData.horizontalAlignment = GridData.FILL; + encodingLabel.setLayoutData(gData); encodingField = new Combo(composite, SWT.BORDER); - { - GridData data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.grabExcessHorizontalSpace = true; - encodingField.setLayoutData(data); - } - + gData = new GridData(); + gData.horizontalAlignment = GridData.FILL; + gData.grabExcessHorizontalSpace = true; + encodingField.setLayoutData(gData); for (String encoding : getEncodings()) { encodingField.add(encoding); } @@ -743,8 +659,7 @@ public class ModelCreationWizard extends Wizard implements INewWizard { setControl(composite); } - protected ModifyListener validator = - new ModifyListener() { + protected ModifyListener validator = new ModifyListener() { public void modifyText(ModifyEvent e) { setPageComplete(validatePage()); } @@ -758,7 +673,8 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } protected boolean validatePage() { - return getInitialObjectName() != null && !getInitialObjectName().equals("") && getEncodings().contains(encodingField.getText()); + return getInitialObjectName() != null && !getInitialObjectName().equals("") + && getEncodings().contains(encodingField.getText()); } @Override @@ -768,8 +684,7 @@ public class ModelCreationWizard extends Wizard implements INewWizard { if (initialObjectField.getItemCount() == 1) { initialObjectField.clearSelection(); encodingField.setFocus(); - } - else { + } else { encodingField.clearSelection(); initialObjectField.setFocus(); } @@ -787,7 +702,8 @@ public class ModelCreationWizard extends Wizard implements INewWizard { protected Collection<String> getEncodings() { if (encodings == null) { encodings = new ArrayList<String>(); - for (StringTokenizer stringTokenizer = new StringTokenizer(MbotEditPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) { + for (StringTokenizer stringTokenizer = new StringTokenizer( + MbotEditPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) { encodings.add(stringTokenizer.nextToken()); } } @@ -795,20 +711,15 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } } - public static class RegisteredPackageDialog extends ElementListSelectionDialog - { + public static class RegisteredPackageDialog extends ElementListSelectionDialog { protected boolean isDevelopmentTimeVersion = true; - public RegisteredPackageDialog(Shell parent) - { - super - (parent, - new LabelProvider() - { + public RegisteredPackageDialog(Shell parent) { + super(parent, new LabelProvider() { @Override - public Image getImage(Object element) - { - return ExtendedImageRegistry.getInstance().getImage(EcoreEditPlugin.INSTANCE.getImage("full/obj16/EPackage")); + public Image getImage(Object element) { + return ExtendedImageRegistry.getInstance().getImage( + EcoreEditPlugin.INSTANCE.getImage("full/obj16/EPackage")); } }); @@ -818,49 +729,43 @@ public class ModelCreationWizard extends Wizard implements INewWizard { setTitle(MbotEditPlugin.INSTANCE.getString("_UI_PackageSelection_label")); } - public boolean isDevelopmentTimeVersion() - { + public boolean isDevelopmentTimeVersion() { return isDevelopmentTimeVersion; } - protected void updateElements() - { - if (isDevelopmentTimeVersion) - { - Map<String, URI> ePackageNsURItoGenModelLocationMap = EcorePlugin.getEPackageNsURIToGenModelLocationMap(); - Object [] result = ePackageNsURItoGenModelLocationMap.keySet().toArray(new Object[ePackageNsURItoGenModelLocationMap.size()]); + protected void updateElements() { + if (isDevelopmentTimeVersion) { + final Map<String, URI> ePackageNsURItoGenModelLocationMap = EcorePlugin + .getEPackageNsURIToGenModelLocationMap(); + final Object[] result = ePackageNsURItoGenModelLocationMap.keySet().toArray( + new Object[ePackageNsURItoGenModelLocationMap.size()]); Arrays.sort(result); setListElements(result); - } - else - { - Object [] result = EPackage.Registry.INSTANCE.keySet().toArray(new Object[EPackage.Registry.INSTANCE.size()]); + } else { + final Object[] result = EPackage.Registry.INSTANCE.keySet().toArray( + new Object[EPackage.Registry.INSTANCE.size()]); Arrays.sort(result); setListElements(result); } } @Override - protected Control createDialogArea(Composite parent) - { - Composite result = (Composite)super.createDialogArea(parent); - Composite buttonGroup = new Composite(result, SWT.NONE); - GridLayout layout = new GridLayout(); + protected Control createDialogArea(Composite parent) { + final Composite result = (Composite)super.createDialogArea(parent); + final Composite buttonGroup = new Composite(result, SWT.NONE); + final GridLayout layout = new GridLayout(); layout.numColumns = 2; buttonGroup.setLayout(layout); final Button developmentTimeVersionButton = new Button(buttonGroup, SWT.RADIO); - developmentTimeVersionButton.addSelectionListener - (new SelectionAdapter() - { + developmentTimeVersionButton.addSelectionListener(new SelectionAdapter() { @Override - public void widgetSelected(SelectionEvent event) - { + public void widgetSelected(SelectionEvent event) { isDevelopmentTimeVersion = developmentTimeVersionButton.getSelection(); updateElements(); } }); developmentTimeVersionButton.setText(MbotEditPlugin.INSTANCE.getString("_UI_DevelopmentTimeVersion_label")); - Button runtimeTimeVersionButton = new Button(buttonGroup, SWT.RADIO); + final Button runtimeTimeVersionButton = new Button(buttonGroup, SWT.RADIO); runtimeTimeVersionButton.setText(MbotEditPlugin.INSTANCE.getString("_UI_RuntimeVersion_label")); developmentTimeVersionButton.setSelection(true); @@ -870,4 +775,4 @@ public class ModelCreationWizard extends Wizard implements INewWizard { } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.eef.modelingbot.editor/.gitignore b/plugins/org.eclipse.emf.eef.modelingbot.editor/.gitignore index ba077a403..52c158f30 100644 --- a/plugins/org.eclipse.emf.eef.modelingbot.editor/.gitignore +++ b/plugins/org.eclipse.emf.eef.modelingbot.editor/.gitignore @@ -1 +1,3 @@ bin +/target +/pom.xml diff --git a/plugins/org.eclipse.emf.eef.modelingbot.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.modelingbot.editor/META-INF/MANIFEST.MF index c9c2716fc..500d8d725 100644 --- a/plugins/org.eclipse.emf.eef.modelingbot.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.eef.modelingbot.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.eef.modelingbot.editor;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.eef.modelingBot.presentation.MbotEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.eef.modelingbot/.gitignore b/plugins/org.eclipse.emf.eef.modelingbot/.gitignore index ba077a403..4058d0f36 100644 --- a/plugins/org.eclipse.emf.eef.modelingbot/.gitignore +++ b/plugins/org.eclipse.emf.eef.modelingbot/.gitignore @@ -1 +1,2 @@ bin +/target diff --git a/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF index 698aee2ca..62d313dc4 100644 --- a/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.eef.modelingbot;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel b/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel index f40e6aadf..86dbaaf07 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel +++ b/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel @@ -20,7 +20,9 @@ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mbot.ecore#//Sequence/sequences"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mbot.ecore#//Sequence/processings"/> </genClasses> - <genClasses ecoreClass="mbot.ecore#//Wizard"/> + <genClasses ecoreClass="mbot.ecore#//Wizard"> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference mbot.ecore#//Wizard/referenceableObject"/> + </genClasses> <genClasses image="false" ecoreClass="mbot.ecore#//DocumentedElement"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//DocumentedElement/name"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//DocumentedElement/documentation"/> diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java index b16333ef5..b16333ef5 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java index 1fa23017c..1fa23017c 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java index f617c5671..f617c5671 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java index 814f30a3c..814f30a3c 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java index 545c7fb1b..545c7fb1b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java index 8a670c8ad..8a670c8ad 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java index 73c1e4ee3..73c1e4ee3 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java index 3fb807893..3fb807893 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java index 696ff2b65..696ff2b65 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java index 3b8250295..3b8250295 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java index e4e81c30c..e4e81c30c 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java index 45a3bccc1..45a3bccc1 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java index b99eecb40..b99eecb40 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java index 890605295..890605295 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java index ab110cf77..ab110cf77 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java index afc377502..afc377502 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java index 5315af8d5..5315af8d5 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java index 40279e98f..40279e98f 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java index 1b4740beb..1b4740beb 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java index 06c4d4876..06c4d4876 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java index e8b9fd571..e8b9fd571 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java index 896eb9967..896eb9967 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java index d45df9511..d45df9511 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java index 0ea3ed0df..0ea3ed0df 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java index 513d5553b..513d5553b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java index 2508b9b2b..2508b9b2b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java index 05f28b134..05f28b134 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java index 3f29be889..3f29be889 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java index e213bf28b..e213bf28b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java index b41e9e159..b41e9e159 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java index 27a2f0f84..27a2f0f84 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java index 3e3df2a39..3e3df2a39 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java index 0203393a6..0203393a6 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java index 6f92d38e7..6f92d38e7 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java index 54c9f5d31..54c9f5d31 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java index 881159082..881159082 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java index e2bc972b4..e2bc972b4 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java index f3daafb14..f3daafb14 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java index 037f48948..037f48948 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java index 9312ce9e2..9312ce9e2 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java index 4930edae6..4930edae6 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java index 96eb16642..96eb16642 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java index d4ed62314..d4ed62314 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java index 001d480f7..001d480f7 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java index 05ee392f6..05ee392f6 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java index e18a57974..e18a57974 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java index 2b643d309..2b643d309 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java index e086ea6d6..e086ea6d6 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java index 9ec4a05ec..9ec4a05ec 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java index 5ceac9f33..5ceac9f33 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java index 879ee3cad..879ee3cad 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java index 04a2ea35a..04a2ea35a 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java index 06ca4896b..06ca4896b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java index 984c9ab83..984c9ab83 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java index d1f90d0aa..d1f90d0aa 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java index 75d798c91..75d798c91 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java index 46a8faccb..46a8faccb 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java index 7cd3bcc2a..7cd3bcc2a 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java index 61adf323d..61adf323d 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java index f826811db..aa8465c07 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java @@ -322,13 +322,22 @@ public interface ModelingBotPackage extends EPackage { int WIZARD__PROCESSINGS = SEQUENCE__PROCESSINGS; /** + * The feature id for the '<em><b>Referenceable Object</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int WIZARD__REFERENCEABLE_OBJECT = SEQUENCE_FEATURE_COUNT + 0; + + /** * The number of structural features of the '<em>Wizard</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int WIZARD_FEATURE_COUNT = SEQUENCE_FEATURE_COUNT + 0; + int WIZARD_FEATURE_COUNT = SEQUENCE_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.emf.eef.modelingBot.impl.ModelingBotImpl <em>Modeling Bot</em>}' class. @@ -611,6 +620,17 @@ public interface ModelingBotPackage extends EPackage { EClass getWizard(); /** + * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.Wizard#getReferenceableObject <em>Referenceable Object</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Referenceable Object</em>'. + * @see org.eclipse.emf.eef.modelingBot.Wizard#getReferenceableObject() + * @see #getWizard() + * @generated + */ + EReference getWizard_ReferenceableObject(); + + /** * Returns the meta object for class '{@link org.eclipse.emf.eef.modelingBot.DocumentedElement <em>Documented Element</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -812,6 +832,14 @@ public interface ModelingBotPackage extends EPackage { EClass WIZARD = eINSTANCE.getWizard(); /** + * The meta object literal for the '<em><b>Referenceable Object</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference WIZARD__REFERENCEABLE_OBJECT = eINSTANCE.getWizard_ReferenceableObject(); + + /** * The meta object literal for the '{@link org.eclipse.emf.eef.modelingBot.impl.DocumentedElementImpl <em>Documented Element</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java index e634c6855..e634c6855 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java index 7dd61e358..7dd61e358 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java index 8d2186e47..8d2186e47 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java index 9d98e88ca..9d98e88ca 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java index 1939b8b13..1939b8b13 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java index f6c40ab91..5770a0486 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java @@ -10,16 +10,50 @@ *******************************************************************************/ package org.eclipse.emf.eef.modelingBot; +import org.eclipse.emf.eef.extended.editor.ReferenceableObject; + /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Wizard</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.eef.modelingBot.Wizard#getReferenceableObject <em>Referenceable Object</em>}</li> + * </ul> + * </p> * * @see org.eclipse.emf.eef.modelingBot.ModelingBotPackage#getWizard() * @model * @generated */ public interface Wizard extends Sequence { + + /** + * Returns the value of the '<em><b>Referenceable Object</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Referenceable Object</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Referenceable Object</em>' reference. + * @see #setReferenceableObject(ReferenceableObject) + * @see org.eclipse.emf.eef.modelingBot.ModelingBotPackage#getWizard_ReferenceableObject() + * @model required="true" + * @generated + */ + ReferenceableObject getReferenceableObject(); + + /** + * Sets the value of the '{@link org.eclipse.emf.eef.modelingBot.Wizard#getReferenceableObject <em>Referenceable Object</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Referenceable Object</em>' reference. + * @see #getReferenceableObject() + * @generated + */ + void setReferenceableObject(ReferenceableObject value); } // Wizard diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java index 34f29019c..34f29019c 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java index f8ad40824..f8ad40824 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java index 13d61bc43..13d61bc43 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java index 1dcc6da9a..1dcc6da9a 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java index 1b7653f10..1b7653f10 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java index 681daf68f..7f6da8155 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java @@ -265,6 +265,15 @@ public class ModelingBotPackageImpl extends EPackageImpl implements ModelingBotP * <!-- end-user-doc --> * @generated */ + public EReference getWizard_ReferenceableObject() { + return (EReference)wizardEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getDocumentedElement() { return documentedElementEClass; } @@ -397,6 +406,7 @@ public class ModelingBotPackageImpl extends EPackageImpl implements ModelingBotP createEReference(sequenceEClass, SEQUENCE__PROCESSINGS); wizardEClass = createEClass(WIZARD); + createEReference(wizardEClass, WIZARD__REFERENCEABLE_OBJECT); documentedElementEClass = createEClass(DOCUMENTED_ELEMENT); createEAttribute(documentedElementEClass, DOCUMENTED_ELEMENT__NAME); @@ -443,6 +453,7 @@ public class ModelingBotPackageImpl extends EPackageImpl implements ModelingBotP // Obtain other dependent packages EEFActionsPackage theEEFActionsPackage = (EEFActionsPackage)EPackage.Registry.INSTANCE.getEPackage(EEFActionsPackage.eNS_URI); EclipseActionsPackage theEclipseActionsPackage = (EclipseActionsPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseActionsPackage.eNS_URI); + EditorPackage theEditorPackage = (EditorPackage)EPackage.Registry.INSTANCE.getEPackage(EditorPackage.eNS_URI); ComponentsPackage theComponentsPackage = (ComponentsPackage)EPackage.Registry.INSTANCE.getEPackage(ComponentsPackage.eNS_URI); EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); @@ -475,6 +486,7 @@ public class ModelingBotPackageImpl extends EPackageImpl implements ModelingBotP initEReference(getSequence_Processings(), this.getProcessing(), null, "processings", null, 0, -1, Sequence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(wizardEClass, Wizard.class, "Wizard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getWizard_ReferenceableObject(), theEditorPackage.getReferenceableObject(), null, "referenceableObject", null, 1, 1, Wizard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(documentedElementEClass, DocumentedElement.class, "DocumentedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDocumentedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, DocumentedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java index 07ab9f850..07ab9f850 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java index 630e841bb..630e841bb 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java index 265428af4..265428af4 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java index 19f852ece..ecb3ac585 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java @@ -10,8 +10,12 @@ *******************************************************************************/ package org.eclipse.emf.eef.modelingBot.impl; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.eef.extended.editor.ReferenceableObject; import org.eclipse.emf.eef.modelingBot.ModelingBotPackage; import org.eclipse.emf.eef.modelingBot.Wizard; @@ -20,12 +24,26 @@ import org.eclipse.emf.eef.modelingBot.Wizard; * An implementation of the model object '<em><b>Wizard</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.eef.modelingBot.impl.WizardImpl#getReferenceableObject <em>Referenceable Object</em>}</li> + * </ul> * </p> * * @generated */ public class WizardImpl extends SequenceImpl implements Wizard { /** + * The cached value of the '{@link #getReferenceableObject() <em>Referenceable Object</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getReferenceableObject() + * @generated + * @ordered + */ + protected ReferenceableObject referenceableObject; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -44,4 +62,101 @@ public class WizardImpl extends SequenceImpl implements Wizard { return ModelingBotPackage.Literals.WIZARD; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ReferenceableObject getReferenceableObject() { + if (referenceableObject != null && referenceableObject.eIsProxy()) { + InternalEObject oldReferenceableObject = (InternalEObject)referenceableObject; + referenceableObject = (ReferenceableObject)eResolveProxy(oldReferenceableObject); + if (referenceableObject != oldReferenceableObject) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelingBotPackage.WIZARD__REFERENCEABLE_OBJECT, oldReferenceableObject, referenceableObject)); + } + } + return referenceableObject; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ReferenceableObject basicGetReferenceableObject() { + return referenceableObject; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setReferenceableObject(ReferenceableObject newReferenceableObject) { + ReferenceableObject oldReferenceableObject = referenceableObject; + referenceableObject = newReferenceableObject; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ModelingBotPackage.WIZARD__REFERENCEABLE_OBJECT, oldReferenceableObject, referenceableObject)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case ModelingBotPackage.WIZARD__REFERENCEABLE_OBJECT: + if (resolve) return getReferenceableObject(); + return basicGetReferenceableObject(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case ModelingBotPackage.WIZARD__REFERENCEABLE_OBJECT: + setReferenceableObject((ReferenceableObject)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case ModelingBotPackage.WIZARD__REFERENCEABLE_OBJECT: + setReferenceableObject((ReferenceableObject)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case ModelingBotPackage.WIZARD__REFERENCEABLE_OBJECT: + return referenceableObject != null; + } + return super.eIsSet(featureID); + } + } //WizardImpl diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java index 372270116..372270116 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java index 25bf2ce9b..25bf2ce9b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java index 9466dbbb4..cc99d3764 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Obeo. + * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,11 +22,9 @@ import org.eclipse.emf.eef.extended.editor.ReferenceableObject; import org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter; /** - * Interface for modeling bot : define the actions modelised in modeling bot - * resource + * Interface for modeling bot : define the actions modelised in modeling bot resource. * * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public interface IModelingBot { @@ -93,7 +91,6 @@ public interface IModelingBot { /** * Save an editor. - * */ void save(); @@ -105,7 +102,8 @@ public interface IModelingBot { * @param eContainingFeature * @return */ - EObject add(org.eclipse.emf.eef.components.PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, EClass type); + EObject add(org.eclipse.emf.eef.components.PropertiesEditionElement propertiesEditionElement, + ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, EClass type); /** * Remove an element. @@ -124,7 +122,8 @@ public interface IModelingBot { * @param eContainingFeature * @return */ - void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, String value); + void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, String value); /** * Set an element. @@ -133,7 +132,8 @@ public interface IModelingBot { * @param referenceableObject * @param eContainingFeature */ - void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, ReferenceableObject value); + void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, ReferenceableObject value); /** * Unset an element. @@ -142,7 +142,8 @@ public interface IModelingBot { * @param referenceableObject * @param eContainingFeature */ - void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature); + void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature); /** * Create a new resource. @@ -165,17 +166,16 @@ public interface IModelingBot { void setSequenceType(SequenceType sequenceType); /** - * Validate batch editing + * Validate batch editing. */ void validateBatchEditing(); /** - * Check + * Check. */ void check(); /** - * * @return the test model resource. */ Resource getActiveResource(); diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java index cbf7af3a8..913f24d49 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Obeo. + * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.emf.eef.modelingBot.batch; +import static org.junit.Assert.fail; + import java.io.IOException; import org.eclipse.core.runtime.CoreException; @@ -40,37 +42,38 @@ import org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter; /** * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a> - * */ public class BatchModelingBot implements IModelingBot { - private IProgressMonitor monitor; private EditingDomain editingDomain; + private AdapterFactory adapterFactory; + private Resource activeResource; private EEFInterpreter interpreter; /** - * + * Constructor. */ public BatchModelingBot() { - monitor = new NullProgressMonitor(); adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); editingDomain = new AdapterFactoryEditingDomain(adapterFactory, new BasicCommandStack()); interpreter = new EEFInterpreter(this, editingDomain); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#runModelingBot(java.lang.String) */ public void runModelingBot(String path) throws CoreException, IOException { interpreter.runModelingBot(path); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createProject(java.lang.String) */ public void createProject(String projectName) { @@ -84,8 +87,9 @@ public class BatchModelingBot implements IModelingBot { } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openProject(java.lang.String) */ public void openProject(String projectName) { @@ -98,8 +102,9 @@ public class BatchModelingBot implements IModelingBot { // } } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#closeProject(java.lang.String) */ public void closeProject(String projectName) { @@ -112,8 +117,9 @@ public class BatchModelingBot implements IModelingBot { // } } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#removeProject(java.lang.String) */ public void removeProject(String projectName) { @@ -126,26 +132,29 @@ public class BatchModelingBot implements IModelingBot { // } } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openPerspective(java.lang.String) */ public void openPerspective(String name) { // Nothing to do } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openEEFEditor(java.lang.String) */ public void openEEFEditor(String path) { - URI uri = URI.createPlatformResourceURI(path, true); - Resource activeResource = editingDomain.getResourceSet().getResource(uri, true); + final URI uri = URI.createPlatformResourceURI(path, true); + final Resource activeResource = editingDomain.getResourceSet().getResource(uri, true); this.activeResource = activeResource; } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#closeEditor(java.lang.String) */ public void closeEditor(String path) { @@ -154,8 +163,9 @@ public class BatchModelingBot implements IModelingBot { editingDomain.getResourceSet().getResources().remove(activeResource); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#save() */ public void save() { @@ -170,78 +180,100 @@ public class BatchModelingBot implements IModelingBot { // } } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#add(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EClass) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#add(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * org.eclipse.emf.ecore.EClass) */ - public EObject add(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, EClass type) { - EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); + public EObject add(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, EClass type) { + final EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); activeResource = eObjectFromReferenceableEObject.eResource(); - EObject value = EcoreUtil.create(type); - Command command = AddCommand.create(editingDomain, eObjectFromReferenceableEObject, eContainingFeature, value); + final EObject value = EcoreUtil.create(type); + final Command command = AddCommand.create(editingDomain, eObjectFromReferenceableEObject, eContainingFeature, value); editingDomain.getCommandStack().execute(command); return value; } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#remove(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#remove(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject) */ public void remove(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject) { - EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); + final EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); activeResource = eObjectFromReferenceableEObject.eResource(); EcoreUtil.remove(eObjectFromReferenceableEObject); } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.String) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * java.lang.String) */ - public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, String value) { - EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); + public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, String value) { + final EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); if (eContainingFeature instanceof EAttribute) { activeResource = eObjectFromReferenceableEObject.eResource(); - Object createFromString = EcoreUtil.createFromString(((EAttribute) eContainingFeature).getEAttributeType(), value); - Command command = SetCommand.create(editingDomain, eObjectFromReferenceableEObject, eContainingFeature, createFromString); + final Object createFromString = EcoreUtil.createFromString(((EAttribute)eContainingFeature).getEAttributeType(), + value); + final Command command = SetCommand.create(editingDomain, eObjectFromReferenceableEObject, eContainingFeature, + createFromString); editingDomain.getCommandStack().execute(command); } else { - // TODO: Error ! + fail("Cannot set without a eContainingFeature attribute"); } } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.eef.extended.editor.ReferenceableObject) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject) */ - public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, ReferenceableObject value) { - EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); + public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, ReferenceableObject value) { + final EObject eObjectFromReferenceableEObject = interpreter.getEObjectFromReferenceableEObject(referenceableObject); if (eContainingFeature instanceof EReference) { activeResource = eObjectFromReferenceableEObject.eResource(); - Command command = SetCommand.create(editingDomain, eObjectFromReferenceableEObject, eContainingFeature, interpreter.getEObjectFromReferenceableEObject(value)); + final Command command = SetCommand.create(editingDomain, eObjectFromReferenceableEObject, eContainingFeature, + interpreter.getEObjectFromReferenceableEObject(value)); editingDomain.getCommandStack().execute(command); } else { - // TODO: Error ! + fail("Cannot set without a eContainingFeature reference"); } } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#unset(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#unset(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature) */ - public void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature) { + public void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature) { // TODO Auto-generated method stub } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createModel(java.lang.String, java.lang.String, org.eclipse.emf.ecore.EClass) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createModel(java.lang.String, java.lang.String, + * org.eclipse.emf.ecore.EClass) */ public EObject createModel(String path, String modelName, EClass eClass) { // try { - URI uri = URI.createPlatformResourceURI(path + "/" + modelName, true); - Resource activeResource = editingDomain.getResourceSet().createResource(uri); - EObject create = EcoreUtil.create(eClass); + final URI uri = URI.createPlatformResourceURI(path + "/" + modelName, true); + final Resource activeResource = editingDomain.getResourceSet().createResource(uri); + final EObject create = EcoreUtil.create(eClass); activeResource.getContents().add(create); // activeResource.save(Collections.EMPTY_MAP); this.activeResource = activeResource; diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java index 714b23bb6..d0720b02e 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java @@ -12,26 +12,25 @@ package org.eclipse.emf.eef.modelingBot.exception; /** * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a> - * */ public class InputModelInvalidException extends Exception { /** - * Serialization + * Serialization. */ private static final long serialVersionUID = 5938605662196039272L; private String messageInfo; /** - * default constructor + * default constructor. */ public InputModelInvalidException() { super(); } /** - * constructor with info + * constructor with info. * * @param info * the info @@ -48,9 +47,9 @@ public class InputModelInvalidException extends Exception { */ @Override public String getMessage() { - String message = "The input model is invalid for test"; + final String message = "The input model is invalid for test"; if (messageInfo != null) { - StringBuilder builder = new StringBuilder(message); + final StringBuilder builder = new StringBuilder(message); builder.append(" : "); builder.append(messageInfo); return builder.toString(); diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java index 8f9f5560e..c5f43c53b 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java @@ -12,26 +12,25 @@ package org.eclipse.emf.eef.modelingBot.exception; /** * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public class WidgetInvalidException extends Exception { /** - * Serialization + * Serialization. */ private static final long serialVersionUID = 5938605662196039272L; private String messageInfo; /** - * default constructor + * default constructor. */ public WidgetInvalidException() { super(); } /** - * constructor with info + * constructor with info. * * @param info * the info @@ -48,9 +47,9 @@ public class WidgetInvalidException extends Exception { */ @Override public String getMessage() { - String message = "The widget is invalid for test"; + final String message = "The widget is invalid for test"; if (messageInfo != null) { - StringBuilder builder = new StringBuilder(message); + final StringBuilder builder = new StringBuilder(message); builder.append(" : "); builder.append(messageInfo); return builder.toString(); diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java index 88e44c8e4..dfd2122b1 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java @@ -32,7 +32,7 @@ public class EEFModelHelper { * @return the object from the feature. */ public static Object eGet(EObject container, EStructuralFeature eContainingFeature) { - Object eGet = container.eGet(container.eClass().getEStructuralFeature(eContainingFeature.getName())); + final Object eGet = container.eGet(container.eClass().getEStructuralFeature(eContainingFeature.getName())); if (eGet instanceof EList) { return (EObject) ((EList) eGet).get(((EList) eGet).size() - 1); } @@ -45,7 +45,7 @@ public class EEFModelHelper { * @return a list containing the element to expand */ public static List<Object> getExpansionPath(EObject modelElement) { - List<Object> result = new ArrayList<Object>(); + final List<Object> result = new ArrayList<Object>(); result.add(modelElement); EObject container = modelElement.eContainer(); while (container != null) { diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java index 5117a3203..2eaf5c7f9 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java @@ -22,17 +22,16 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; /** * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public class PropertiesEditionHelper { /** - * SWT EEF Bot + * SWT EEF Bot. */ private SWTEEFBot bot; /** - * Create a PropertiesEditionHelper + * Create a PropertiesEditionHelper. * * @param bot * SWTEEFBot @@ -49,10 +48,12 @@ public class PropertiesEditionHelper { * @param value * @param sequenceType */ - public void updateFeature(SWTBotTreeItem selectNode, PropertiesEditionElement propertiesEditionElement, String value, SequenceType sequenceType) { + public void updateFeature(SWTBotTreeItem selectNode, PropertiesEditionElement propertiesEditionElement, + String value, SequenceType sequenceType) { if (!propertiesEditionElement.getViews().isEmpty()) { - ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); - if (elementEditor.getRepresentation().getName().equals("Text")) { + final ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); + final String representationName = elementEditor.getRepresentation().getName(); + if ("Text".equals(representationName) || "Textarea".equals(representationName)) { updateText(selectNode, elementEditor, value, sequenceType); } } @@ -60,31 +61,17 @@ public class PropertiesEditionHelper { } /** - * Update widget text + * Update widget text. * * @param selectNode * @param elementEditor * @param value * @param sequenceType */ - private void updateText(SWTBotTreeItem selectNode, ElementEditor elementEditor, String value, SequenceType sequenceType) { - if (sequenceType.equals(SequenceType.DETAILS_PAGE)) { - updateText(elementEditor, value); - } else if (sequenceType.equals(SequenceType.WIZARD)) { - if (selectNode != null) { - selectNode.doubleClick(); - } - updateText(elementEditor, value); - } - } - - /** - * @param elementEditor - * @param value - */ - private void updateText(ElementEditor elementEditor, String value) { + private void updateText(SWTBotTreeItem selectNode, ElementEditor elementEditor, String value, + SequenceType sequenceType) { SWTBotHelper.waitAllUiEvents(); - SWTBotText textWithLabel = bot.textWithLabel(StringHelper.toU1Case(elementEditor.getName()) + " : "); + final SWTBotText textWithLabel = bot.textWithLabel(StringHelper.toU1Case(elementEditor.getName()) + ": "); textWithLabel.setText(value); SWTBotHelper.pressEnterKey(textWithLabel.widget); SWTBotHelper.sendFocusLost(textWithLabel.widget); @@ -95,29 +82,24 @@ public class PropertiesEditionHelper { this.bot = bot; } - public void addFeature(SWTBotTreeItem selectNode, PropertiesEditionElement propertiesEditionElement, SequenceType sequenceType) { + public void addFeature(SWTBotTreeItem selectNode, PropertiesEditionElement propertiesEditionElement, + SequenceType sequenceType) { assertFalse(propertiesEditionElement.getViews().isEmpty()); - ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); - if (sequenceType.equals(SequenceType.DETAILS_PAGE)) { - bot.addButtonAdvancedTableComposition(elementEditor.getQualifiedIdentifier()).click(); - } else if (sequenceType.equals(SequenceType.WIZARD)) { - bot.addButtonAdvancedTableComposition(elementEditor.getQualifiedIdentifier()).click(); - } - + final ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); + bot.addButtonAdvancedTableComposition(elementEditor.getQualifiedIdentifier()).click(); + bot.button(UIConstants.FINISH_BUTTON).click(); } - public void removeFeature(EObject remove, PropertiesEditionElement propertiesEditionElement, SequenceType sequenceType) { + public void removeFeature(EObject remove, PropertiesEditionElement propertiesEditionElement, + SequenceType sequenceType) { assertFalse(propertiesEditionElement.getViews().isEmpty()); - ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); - if (sequenceType.equals(SequenceType.DETAILS_PAGE)) { - removeFeature(remove, elementEditor); - } else if (sequenceType.equals(SequenceType.WIZARD)) { - removeFeature(remove, elementEditor); - } + final ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); + removeFeature(remove, elementEditor); } private void removeFeature(EObject remove, ElementEditor elementEditor) { - bot.selectInTableWithId(org.eclipse.emf.eef.runtime.ui.UIConstants.EEF_WIDGET_ID_KEY, elementEditor.getQualifiedIdentifier(), remove); + bot.selectInTableWithId(org.eclipse.emf.eef.runtime.ui.UIConstants.EEF_WIDGET_ID_KEY, + elementEditor.getQualifiedIdentifier(), remove); bot.removeButtonAdvancedTableComposition(elementEditor.getQualifiedIdentifier()).click(); } diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java index a4b28e60f..6ffc2946a 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java @@ -34,16 +34,15 @@ import org.hamcrest.Matcher; /** * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public class SWTBotHelper { /** - * SWTWorkbenchBot + * SWTWorkbenchBot. */ private static SWTWorkbenchBot bot = new SWTWorkbenchBot(); /** - * Press the enter key + * Press the enter key. * * @param widget * @throws Exception @@ -68,7 +67,7 @@ public class SWTBotHelper { } /** - * Press the enter key + * Press the enter key. * * @param widget * @throws Exception @@ -76,13 +75,14 @@ public class SWTBotHelper { public static void pressEnterKeyInTabContainer(final Widget widget) { UIThreadRunnable.asyncExec(new VoidResult() { public void run() { - searchTabContainer(widget).notifyListeners(SWT.Traverse, keyEvent(SWT.NONE, SWT.CR, SWT.Selection, widget)); + searchTabContainer(widget).notifyListeners(SWT.Traverse, + keyEvent(SWT.NONE, SWT.CR, SWT.Selection, widget)); } }); } private static Composite searchTabContainer(final Widget wid) { - Composite parent = ((Text) wid).getParent(); + Composite parent = ((Text)wid).getParent(); while (parent != null) { if (parent instanceof Composite) return parent; @@ -115,7 +115,7 @@ public class SWTBotHelper { private static Event createEvent(Widget widget) { Event event = new Event(); - event.time = (int) System.currentTimeMillis(); + event.time = (int)System.currentTimeMillis(); event.widget = widget; event.display = bot.getDisplay(); return event; @@ -128,10 +128,11 @@ public class SWTBotHelper { * Label to find. */ // CHECKSTYLE:OFF - @SuppressWarnings({ "restriction", "unchecked" }) + @SuppressWarnings({"restriction", "unchecked"}) // CHECKSTYLE:ON public static void selectPropertyTabItem(final String label) { - final Matcher<TabbedPropertyList> matcher = WidgetMatcherFactory.allOf(WidgetMatcherFactory.widgetOfType(TabbedPropertyList.class)); + final Matcher<TabbedPropertyList> matcher = WidgetMatcherFactory.allOf(WidgetMatcherFactory + .widgetOfType(TabbedPropertyList.class)); final List<TabbedPropertyList> widgets = widget(matcher); UIThreadRunnable.syncExec(SWTUtils.display(), new VoidResult() { @@ -139,7 +140,8 @@ public class SWTBotHelper { for (final TabbedPropertyList tabbedProperty : widgets) { final ListElement tabItem = getTabItem(label, tabbedProperty); if (tabItem != null) { - final Event mouseEvent = createEvent(tabItem, tabItem.getBounds().x, tabItem.getBounds().y, 1, SWT.BUTTON1, 1); + final Event mouseEvent = createEvent(tabItem, tabItem.getBounds().x, tabItem.getBounds().y, 1, + SWT.BUTTON1, 1); tabItem.notifyListeners(SWT.MouseUp, mouseEvent); } } @@ -176,9 +178,10 @@ public class SWTBotHelper { * the number of times the mouse was clicked. * @return an event that encapsulates {@link #widget} and {@link #display} */ - private static Event createEvent(final Widget widget, final int x, final int y, final int button, final int stateMask, final int count) { + private static Event createEvent(final Widget widget, final int x, final int y, final int button, + final int stateMask, final int count) { final Event event = new Event(); - event.time = (int) System.currentTimeMillis(); + event.time = (int)System.currentTimeMillis(); event.widget = widget; event.display = bot.getDisplay(); event.x = x; @@ -197,17 +200,16 @@ public class SWTBotHelper { @SuppressWarnings("restriction") private static ListElement getTabItem(final String label, final TabbedPropertyList tabbedProperty) { for (final Object listElement : tabbedProperty.getTabList()) { - if (listElement instanceof ListElement && ((ListElement) listElement).getTabItem().getText().equals(label)) { - return (ListElement) listElement; + if (listElement instanceof ListElement && ((ListElement)listElement).getTabItem().getText().equals(label)) { + return (ListElement)listElement; } } return null; } /** - * WARNING this class should move in SWTBot one day. WARNING if the text is - * not found it will not failed this method to get disposed elements with - * the current click on context menu SWTBot method + * WARNING this class should move in SWTBot one day. WARNING if the text is not found it will not failed + * this method to get disposed elements with the current click on context menu SWTBot method * * @param treeItem * the current item @@ -225,9 +227,8 @@ public class SWTBotHelper { } /** - * WARNING this class should move in SWTBot one day. WARNING if the text is - * not found it will not failed this method to get disposed elements with - * the current click on context menu SWTBot method + * WARNING this class should move in SWTBot one day. WARNING if the text is not found it will not failed + * this method to get disposed elements with the current click on context menu SWTBot method * * @param tree * the tree diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java index 72e984402..72e984402 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java index 9d1d0ddcc..d00821a0d 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Obeo. + * Copyright (c) 2008, 2012 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,20 +12,33 @@ package org.eclipse.emf.eef.modelingBot.helper; /** + * Utility class for Styring Manipulations. * * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ -public class StringHelper { +public final class StringHelper { + + /** + * Constructor. + */ + private StringHelper() { + // avoid instanciation + } + /** + * Return the string with the firstChar Uppercased. + * + * @param from + * the string to modify + * @return the String with the first char uppercased. + */ public static String toU1Case(String from) { - String ret = ""; //$NON-NLS-1$ if (from.length() > 0) { - StringBuilder sb = new StringBuilder(from.length()); + final StringBuilder sb = new StringBuilder(from.length()); sb.append(Character.toUpperCase(from.charAt(0))).append(from.substring(1)); - ret = sb.toString(); + return sb.toString(); } - return ret; + return ""; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java index 0bfcf9655..0bfcf9655 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java index c37437d68..2feb6164a 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java @@ -10,16 +10,20 @@ *******************************************************************************/ package org.eclipse.emf.eef.modelingBot.interpreter; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.util.Diagnostician; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.eef.components.PropertiesEditionContext; @@ -40,18 +44,19 @@ import org.eclipse.emf.eef.modelingBot.swtbot.ComposedEEFBot; * Interpreter for a list of modeling bots. * * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public class ComposedEEFInterpreter implements IModelingBotInterpreter { /** - * Editing domain + * Editing domain. */ private EditingDomain editingDomain; + /** - * List of modeling bots + * List of modeling bots. */ private Collection<IModelingBot> modelingBots = new ArrayList<IModelingBot>(); + /** * Map Bot <-> interpreter. */ @@ -59,7 +64,7 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter { // mapModelingBotInterpreter = new HashMap<IModelingBot, // IModelingBotInterpreter>(); /** - * ComposedEEFBot + * ComposedEEFBot. */ private IModelingBot composedEEFBot; @@ -89,52 +94,60 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter { } - /** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runModelingBot(java.lang.String, org.eclipse.emf.eef.modelingBot.IModelingBot) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runModelingBot(java.lang.String, + * org.eclipse.emf.eef.modelingBot.IModelingBot) */ public void runModelingBot(String path) throws CoreException, IOException { - Resource modelingBotResource = loadModel(path); + final Resource modelingBotResource = loadModel(path); EcoreUtil.resolveAll(modelingBotResource.getResourceSet()); assertFalse("The modeling bot resource is empty.", modelingBotResource.getContents().isEmpty()); - ModelingBot mbot = (ModelingBot) modelingBotResource.getContents().get(0); + assertTrue("The modeling bot model contains errors, correct them first", modelingBotResource.getErrors() + .isEmpty()); + final ModelingBot mbot = (ModelingBot)modelingBotResource.getContents().get(0); + final Diagnostic diag = Diagnostician.INSTANCE.validate(mbot); + assertTrue("The modeling bot model contains errors, correct them first", diag.getSeverity() == Diagnostic.OK); + assertNotNull("The modeling bot resource is empty.", mbot); for (IModelingBot bot : modelingBots) { bot.getModelingBotInterpreter().setPropertiesEditionContext(mbot.getPropertiesEditionContext()); } for (Sequence sequence : mbot.getSequences()) { if (sequence instanceof Scenario) { - Scenario scenario = (Scenario) sequence; + final Scenario scenario = (Scenario)sequence; runSequence(scenario); } } - } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runSequence(org.eclipse.emf.eef.modelingBot.Sequence) */ public void runSequence(Sequence sequence) { for (Processing processing : sequence.getProcessings()) { if (processing instanceof Action) { - runAction((Action) processing); + runAction((Action)processing); } else if (processing instanceof DetailsPage) { setSequenceType(SequenceType.DETAILS_PAGE); - runSequence((DetailsPage) processing); + runSequence((DetailsPage)processing); } else if (processing instanceof PropertiesView) { setSequenceType(SequenceType.PROPERTIES_VIEW); - runSequence((PropertiesView) processing); + runSequence((PropertiesView)processing); } else if (processing instanceof Wizard) { setSequenceType(SequenceType.WIZARD); - runSequence((Wizard) processing); + runSequence((Wizard)processing); finishBatchEditing(processing); } } } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runAction(org.eclipse.emf.eef.modelingBot.Action) */ public void runAction(Action action) { @@ -147,8 +160,9 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter { } } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#finishBatchEditing(org.eclipse.emf.eef.modelingBot.Processing) */ public void finishBatchEditing(Processing processing) { @@ -173,14 +187,15 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter { * @throws CoreException */ public Resource loadModel(String path) throws IOException, CoreException { - URI fileURI = URI.createPlatformPluginURI(path, true); - Resource resource = editingDomain.getResourceSet().getResource(fileURI, true); + final URI fileURI = URI.createPlatformPluginURI(path, true); + final Resource resource = editingDomain.getResourceSet().getResource(fileURI, true); assertNotNull("The modeling bot resource can not be loaded.", resource); return resource; } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#getPropertiesEditionContext() */ public PropertiesEditionContext getPropertiesEditionContext() { @@ -188,12 +203,12 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter { } /** - * {@inheritDoc) + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#setPropertiesEditionContext(org.eclipse.emf.eef.components.PropertiesEditionContext) */ public void setPropertiesEditionContext(PropertiesEditionContext context) { } - } diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java index 26e8683f2..11ca76a0e 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java @@ -10,17 +10,21 @@ *******************************************************************************/ package org.eclipse.emf.eef.modelingBot.interpreter; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.util.Diagnostician; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.eef.components.PropertiesEditionContext; @@ -54,32 +58,31 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; * Interpreter for SWTEEFBot or BatchModelingBot. * * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public class EEFInterpreter implements IModelingBotInterpreter { /** - * Editing domain + * Editing domain. */ private EditingDomain editingDomain; /** - * Map ReFerenceableObject -> EObject created + * Map ReFerenceableObject -> EObject created. */ - private Map<ReferenceableObject, EObject> refObjectToEObject = new HashMap<ReferenceableObject, EObject>(); + private Map<ReferenceableObject, EObject> refObjectToEObjectMap = new HashMap<ReferenceableObject, EObject>(); /** - * Map Sequence -> boolean to know of the sequence has been canceled + * Map Sequence -> boolean to know of the sequence has been canceled. */ private Map<Sequence, Boolean> mapSequenceToCancel = new HashMap<Sequence, Boolean>(); /** - * Modeling bot + * Modeling bot. */ private IModelingBot bot; /** - * PropertiesEditionContext + * PropertiesEditionContext. */ private PropertiesEditionContext propertiesEditionContext; @@ -88,6 +91,8 @@ public class EEFInterpreter implements IModelingBotInterpreter { * * @param editingDomain * editing domain + * @param bot + * the modelingbot */ public EEFInterpreter(IModelingBot bot, EditingDomain editingDomain) { super(); @@ -99,7 +104,7 @@ public class EEFInterpreter implements IModelingBotInterpreter { * @return the map of ReferenceableObject */ public Map<ReferenceableObject, EObject> getRefObjectToEObject() { - return refObjectToEObject; + return refObjectToEObjectMap; } /** @@ -109,25 +114,27 @@ public class EEFInterpreter implements IModelingBotInterpreter { * ReferenceableObject */ public void setRefObjectToEObject(Map<ReferenceableObject, EObject> refObjectToEObject) { - this.refObjectToEObject = refObjectToEObject; + this.refObjectToEObjectMap = refObjectToEObject; } /** + * Returns the referenced object. + * * @param ref * ReferenceableObject * @return the object corresponding to the referenceable object */ public EObject getEObjectFromReferenceableEObject(ReferenceableObject ref) { - return refObjectToEObject.get(ref); + return refObjectToEObjectMap.get(ref); } /** * Dispose the maps of the interpreter. */ public void dispose() { - refObjectToEObject.clear(); + refObjectToEObjectMap.clear(); mapSequenceToCancel.clear(); - refObjectToEObject = null; + refObjectToEObjectMap = null; mapSequenceToCancel = null; } @@ -137,63 +144,68 @@ public class EEFInterpreter implements IModelingBotInterpreter { * @param path * path of the model * @return the resource loaded - * @throws IOException - * @throws CoreException */ - public Resource loadModel(String path) throws IOException, CoreException { - URI fileURI = URI.createPlatformPluginURI(path, true); - Resource resource = editingDomain.getResourceSet().getResource(fileURI, true); + public Resource loadModel(String path) { + final URI fileURI = URI.createPlatformPluginURI(path, true); + final Resource resource = editingDomain.getResourceSet().getResource(fileURI, true); assertNotNull("The modeling bot resource can not be loaded.", resource); return resource; } - /** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runModelingBot(java.lang.String, org.eclipse.emf.eef.modelingBot.IModelingBot) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runModelingBot(java.lang.String, + * org.eclipse.emf.eef.modelingBot.IModelingBot) */ public void runModelingBot(String path) throws CoreException, IOException { - Resource modelingBotResource = loadModel(path); + final Resource modelingBotResource = loadModel(path); EcoreUtil.resolveAll(modelingBotResource.getResourceSet()); assertFalse("The modeling bot resource is empty.", modelingBotResource.getContents().isEmpty()); - ModelingBot mbot = (ModelingBot) modelingBotResource.getContents().get(0); + assertTrue("The modeling bot model contains errors, correct them first", modelingBotResource.getErrors().isEmpty()); + final ModelingBot mbot = (ModelingBot)modelingBotResource.getContents().get(0); + final Diagnostic diag = Diagnostician.INSTANCE.validate(mbot); + assertTrue("The modeling bot model contains errors, correct them first", diag.getSeverity() == Diagnostic.OK); assertNotNull("The modeling bot resource is empty.", mbot); propertiesEditionContext = mbot.getPropertiesEditionContext(); for (Sequence sequence : mbot.getSequences()) { if (sequence instanceof Scenario) { - Scenario scenario = (Scenario) sequence; + final Scenario scenario = (Scenario)sequence; runSequence(scenario); } } } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runSequence(org.eclipse.emf.eef.modelingBot.Sequence) */ public void runSequence(Sequence sequence) { for (Processing processing : sequence.getProcessings()) { if (processing instanceof Action) { - runAction((Action) processing); + runAction((Action)processing); } else if (processing instanceof DetailsPage) { bot.setSequenceType(SequenceType.DETAILS_PAGE); - runSequence((DetailsPage) processing); + runSequence((DetailsPage)processing); } else if (processing instanceof PropertiesView) { bot.setSequenceType(SequenceType.PROPERTIES_VIEW); - runSequence((PropertiesView) processing); + runSequence((PropertiesView)processing); } else if (processing instanceof Wizard) { bot.setSequenceType(SequenceType.WIZARD); - runSequence((Wizard) processing); + runSequence((Wizard)processing); finishBatchEditing(processing); } } } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#finishBatchEditing(org.eclipse.emf.eef.modelingBot.Processing) */ public void finishBatchEditing(Processing processing) { - Boolean hasCanceled = mapSequenceToCancel.get(processing); + final Boolean hasCanceled = mapSequenceToCancel.get(processing); if (hasCanceled == null || !hasCanceled) { try { bot.validateBatchEditing(); @@ -204,54 +216,64 @@ public class EEFInterpreter implements IModelingBotInterpreter { mapSequenceToCancel.remove(processing); } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#runAction(org.eclipse.emf.eef.modelingBot.Action) */ public void runAction(Action action) { if (action instanceof CreateProject) { - bot.createProject(((CreateProject) action).getProjectName()); + bot.createProject(((CreateProject)action).getProjectName()); } else if (action instanceof OpenEEFEditor) { - bot.openEEFEditor(((OpenEEFEditor) action).getEditorName()); + bot.openEEFEditor(((OpenEEFEditor)action).getEditorName()); } else if (action instanceof CreateModel) { - EObject addedObject = bot.createModel(((CreateModel) action).getPath(), ((CreateModel) action).getModelName(), ((CreateModel) action).getRoot()); - addModelMap((CreateModel) action, addedObject); + final EObject addedObject = bot.createModel(((CreateModel)action).getPath(), + ((CreateModel)action).getModelName(), ((CreateModel)action).getRoot()); + addModelMap((CreateModel)action, addedObject); } else if (action instanceof Add) { - EObject addedObject = bot.add(((Add) action).getPropertiesEditionElement(), ((Add) action).getReferenceableObject(), ((Add) action).getEContainingFeature(), ((Add) action).getType()); - addActionMap((Add) action, addedObject); + final EObject addedObject = bot.add(((Add)action).getPropertiesEditionElement(), + ((Add)action).getReferenceableObject(), ((Add)action).getEContainingFeature(), + ((Add)action).getType()); + addActionMap((Add)action, addedObject); } else if (action instanceof SetAttribute) { - bot.set(((SetAttribute) action).getPropertiesEditionElement(), ((SetAttribute) action).getReferenceableObject(), ((SetAttribute) action).getEContainingFeature(), ((SetAttribute) action).getValue()); + bot.set(((SetAttribute)action).getPropertiesEditionElement(), + ((SetAttribute)action).getReferenceableObject(), ((SetAttribute)action).getEContainingFeature(), + ((SetAttribute)action).getValue()); } else if (action instanceof SetReference) { - bot.set(((SetReference) action).getPropertiesEditionElement(), ((SetReference) action).getReferenceableObject(), ((SetReference) action).getEContainingFeature(), ((SetReference) action).getValue()); + bot.set(((SetReference)action).getPropertiesEditionElement(), + ((SetReference)action).getReferenceableObject(), ((SetReference)action).getEContainingFeature(), + ((SetReference)action).getValue()); } else if (action instanceof Save) { bot.save(); } else if (action instanceof CloseEditor) { - bot.closeEditor(((CloseEditor) action).getPath()); + bot.closeEditor(((CloseEditor)action).getPath()); } else if (action instanceof CloseProject) { - bot.closeProject(((CloseProject) action).getProjectName()); + bot.closeProject(((CloseProject)action).getProjectName()); } else if (action instanceof RemoveProject) { - bot.removeProject(((RemoveProject) action).getProjectName()); + bot.removeProject(((RemoveProject)action).getProjectName()); } else if (action instanceof Cancel) { - mapSequenceToCancel.put((Sequence) action.eContainer(), true); + mapSequenceToCancel.put((Sequence)action.eContainer(), true); bot.cancel(); } else if (action instanceof Unset) { - bot.unset(((Unset) action).getPropertiesEditionElement(), ((Unset) action).getReferenceableObject(), ((Unset) action).getFeature()); + bot.unset(((Unset)action).getPropertiesEditionElement(), ((Unset)action).getReferenceableObject(), + ((Unset)action).getFeature()); } else if (action instanceof Remove) { - bot.remove(((Remove) action).getPropertiesEditionElement(), ((Remove) action).getReferenceableObject()); - refObjectToEObject.remove(((Remove) action).getReferenceableObject()); + bot.remove(((Remove)action).getPropertiesEditionElement(), ((Remove)action).getReferenceableObject()); + refObjectToEObjectMap.remove(((Remove)action).getReferenceableObject()); } } private void addActionMap(ReferenceableObject action, EObject obj) { - refObjectToEObject.put(action, obj); + refObjectToEObjectMap.put(action, obj); } private void addModelMap(CreateModel action, EObject obj) { - refObjectToEObject.put(action, obj); + refObjectToEObjectMap.put(action, obj); } - /** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#getPropertiesEditionContext() */ public PropertiesEditionContext getPropertiesEditionContext() { @@ -259,10 +281,11 @@ public class EEFInterpreter implements IModelingBotInterpreter { } /** - * @param propertiesEditionContext the propertiesEditionContext to set + * @param pec + * the propertiesEditionContext to set */ - public void setPropertiesEditionContext(PropertiesEditionContext propertiesEditionContext) { - this.propertiesEditionContext = propertiesEditionContext; + public void setPropertiesEditionContext(PropertiesEditionContext pec) { + this.propertiesEditionContext = pec; } - + } diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java index c89cbcd89..751456dd7 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java @@ -18,6 +18,9 @@ import org.eclipse.emf.eef.modelingBot.Action; import org.eclipse.emf.eef.modelingBot.Processing; import org.eclipse.emf.eef.modelingBot.Sequence; +/** + * @author <a href="mailto:stephane.bouchet@obeo.fr">Stephane Bouchet</a> + */ public interface IModelingBotInterpreter { /** @@ -30,7 +33,7 @@ public interface IModelingBotInterpreter { void runModelingBot(String path) throws CoreException, IOException; /** - * Run an action + * Run an action. * * @param action * Action @@ -38,7 +41,7 @@ public interface IModelingBotInterpreter { void runAction(Action action); /** - * Run a sequence + * Run a sequence. * * @param sequence * Sequence diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java index 0d9f20053..0d9f20053 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java index b83ece126..b83ece126 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java index 90b8cfa2c..8afee0a2d 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.emf.eef.modelingBot.swtbot; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.util.ArrayList; @@ -47,20 +47,22 @@ import org.eclipse.emf.eef.runtime.impl.utils.EEFUtils; * Composed eef bot : SWTEEFbot and BatchModeling bot. * * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public class ComposedEEFBot implements IModelingBot { /** * The ResourceSet where to operate. */ - protected EditingDomain editingDomain = new AdapterFactoryEditingDomain(EEFRuntimePlugin.getDefault().getAdapterFactory(), new BasicCommandStack()); + protected EditingDomain editingDomain = new AdapterFactoryEditingDomain(EEFRuntimePlugin.getDefault() + .getAdapterFactory(), new BasicCommandStack()); + /** - * Composed eef interpreter + * Composed eef interpreter. */ private ComposedEEFInterpreter interpreter; + /** - * Bots Collection + * Bots Collection. */ private Collection<IModelingBot> bots; @@ -68,160 +70,192 @@ public class ComposedEEFBot implements IModelingBot { super(); this.bots = bots; editingDomain.getResourceSet().setURIConverter(new EEFURIConverter()); - List<IModelingBot> list = new ArrayList<IModelingBot>(); + final List<IModelingBot> list = new ArrayList<IModelingBot>(); list.addAll(bots); list.add(this); interpreter = new ComposedEEFInterpreter(list, editingDomain); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#runModelingBot(java.lang.String) */ public void runModelingBot(String path) throws CoreException, IOException { interpreter.runModelingBot(path); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createProject(java.lang.String) */ public void createProject(String projectName) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openProject(java.lang.String) */ public void openProject(String projectName) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#closeProject(java.lang.String) */ public void closeProject(String projectName) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#removeProject(java.lang.String) */ public void removeProject(String projectName) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openPerspective(java.lang.String) */ public void openPerspective(String name) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openEEFEditor(java.lang.String) */ public void openEEFEditor(String path) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#closeEditor(java.lang.String) */ public void closeEditor(String path) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#save() */ public void save() { // do nothing } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#add(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EClass) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#add(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * org.eclipse.emf.ecore.EClass) */ - public EObject add(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, EClass type) { + public EObject add(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, EClass type) { // do nothing return null; } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#remove(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#remove(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject) */ public void remove(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject) { // do nothing } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.String) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * java.lang.String) */ - public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, String value) { + public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, String value) { // do nothing } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.eef.extended.editor.ReferenceableObject) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject) */ - public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, ReferenceableObject value) { + public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, ReferenceableObject value) { // do nothing } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#unset(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#unset(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature) */ - public void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature) { + public void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature) { // do nothing } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createModel(java.lang.String, java.lang.String, org.eclipse.emf.ecore.EClass) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createModel(java.lang.String, java.lang.String, + * org.eclipse.emf.ecore.EClass) */ public EObject createModel(String path, String modelName, EClass eClass) { // do nothing return null; } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#cancel() */ public void cancel() { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#setSequenceType(org.eclipse.emf.eef.modelingBot.SequenceType) */ public void setSequenceType(SequenceType sequenceType) { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#validateBatchEditing() */ public void validateBatchEditing() { // do nothing } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#check() */ public void check() { @@ -230,24 +264,27 @@ public class ComposedEEFBot implements IModelingBot { } for (int i = 0; i < bots.size(); i++) { for (int j = i + 1; j < bots.size(); j++) { - assertExpectedModelReached(((IModelingBot) bots.toArray()[i]).getActiveResource(), ((IModelingBot) bots.toArray()[j]).getActiveResource()); + try { + assertExpectedModelReached(((IModelingBot)bots.toArray()[i]).getActiveResource(), + ((IModelingBot)bots.toArray()[j]).getActiveResource()); + } catch (InterruptedException e) { + fail("Error during model comparison."); + } } } } - public void assertExpectedModelReached(Resource expectedModel, Resource batchModel) { - try { - Map<String, Object> options = new HashMap<String, Object>(); - options.put(org.eclipse.emf.compare.match.MatchOptions.OPTION_IGNORE_XMI_ID, Boolean.TRUE); - MatchModel match = MatchService.doResourceMatch(batchModel, expectedModel, options); - DiffModel diff = DiffService.doDiff(match); - List<EObject> diffList = EEFUtils.asEObjectList(diff.eAllContents()); - List<EObject> result = filterAbnormalDiffElement(diffList); - assertEquals("The active model isn't the same that the expected model", result.size(), 0); - } catch (Exception e) { - // How to do that ??? - assertTrue("Error during model comparison", false); + public void assertExpectedModelReached(Resource expectedModel, Resource batchModel) throws InterruptedException { + final Map<String, Object> options = new HashMap<String, Object>(); + options.put(org.eclipse.emf.compare.match.MatchOptions.OPTION_IGNORE_XMI_ID, Boolean.TRUE); + final MatchModel match = MatchService.doResourceMatch(batchModel, expectedModel, options); + final DiffModel diff = DiffService.doDiff(match); + final List<EObject> diffList = EEFUtils.asEObjectList(diff.eAllContents()); + final List<EObject> result = filterAbnormalDiffElement(diffList); + if (!result.isEmpty()) { + System.out.println(result); } + assertTrue("The active model isn't the same that the expected model.", result.isEmpty()); } /** @@ -258,24 +295,28 @@ public class ComposedEEFBot implements IModelingBot { * @return the list of "good" diff */ private List<EObject> filterAbnormalDiffElement(List<EObject> diffList) { - List<EObject> result = new ArrayList<EObject>(); + final List<EObject> result = new ArrayList<EObject>(); for (EObject object : diffList) { - if (!(object instanceof DiffGroup) || (((DiffGroup) object).eContents().size() > 0)) + if (!(object instanceof DiffGroup)) result.add(object); + else if (object.eContents().size() > 0) + result.addAll(filterAbnormalDiffElement(object.eContents())); } return result; } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#getActiveResource() */ public Resource getActiveResource() { return null; } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#getModelingBotInterpreter() */ public IModelingBotInterpreter getModelingBotInterpreter() { diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java index 35563046f..a1f035ff3 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java @@ -48,7 +48,6 @@ import org.eclipse.emf.eef.views.ElementEditor; import org.eclipse.emf.eef.views.View; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; -import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.results.Result; import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; @@ -63,19 +62,19 @@ import org.eclipse.ui.internal.ide.IDEWorkbenchMessages; * SWTBot bor for EEF editor. * * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * */ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { /** - * EEF Interpreter + * The ResourceSet where to operate. */ - private EEFInterpreter interpreter; + protected EditingDomain editingDomain = new AdapterFactoryEditingDomain(EEFRuntimePlugin.getDefault() + .getAdapterFactory(), new BasicCommandStack()); /** - * The ResourceSet where to operate. + * EEF Interpreter. */ - protected EditingDomain editingDomain = new AdapterFactoryEditingDomain(EEFRuntimePlugin.getDefault().getAdapterFactory(), new BasicCommandStack()); + private EEFInterpreter interpreter; /** * The swtbot editor. @@ -114,26 +113,26 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Open the properties view + * Open the properties view. */ public void openPropertiesView() { menu(UIConstants.WINDOW_MENU).menu(UIConstants.SHOW_VIEW_MENU).menu(UIConstants.OTHER_MENU).click(); - SWTBotShell shell = shell(UIConstants.SHOW_VIEW_MENU); + final SWTBotShell shell = shell(UIConstants.SHOW_VIEW_MENU); activateShell(shell); - SWTBotTree viewSelectionTree = tree(); + final SWTBotTree viewSelectionTree = tree(); viewSelectionTree.expandNode(UIConstants.GENERAL_MENU).select(UIConstants.PROPERTIES_VIEW_NAME); button(UIConstants.OK_BUTTON).click(); waitUntil(Conditions.shellCloses(shell)); } /** - * Open Java Perspective + * Open Java Perspective. */ public void openJavaPerspective() { menu(UIConstants.WINDOW_MENU).menu(UIConstants.OPEN_PERSPECTIVE_MENU).menu(UIConstants.OTHER_MENU).click(); - SWTBotShell openPerspectiveShell = shell(UIConstants.OPEN_PERSPECTIVE_MENU); + final SWTBotShell openPerspectiveShell = shell(UIConstants.OPEN_PERSPECTIVE_MENU); activateShell(openPerspectiveShell); try { @@ -145,7 +144,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Activate the shell + * Activate the shell. * * @param shell * SWTBotShell @@ -155,25 +154,24 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * This method close the welcome page if we use the workspace of test for - * the first time + * This method close the welcome page if we use the workspace of test for the first time. */ public void closeWelcomePage() { - try { + closeAllEditors(); + assertNotNull(activeView()); + if (UIConstants.WELCOME_LABEL.equals(activeView().getTitle())) viewByTitle(UIConstants.WELCOME_LABEL).close(); - } catch (WidgetNotFoundException e) { - // do nothing - } } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createProject(java.lang.String) */ public void createProject(String projectName) { activateShell(shells()[0]); menu(UIConstants.FILE_MENU).menu(UIConstants.PROJECT_MENU).click(); - SWTBotShell openProjectShell = shell(UIConstants.NEW_PROJECT_MENU); + final SWTBotShell openProjectShell = shell(UIConstants.NEW_PROJECT_MENU); activateShell(openProjectShell); tree().expandNode(UIConstants.GENERAL_MENU).select(UIConstants.PROJECT_CREATION_MENU); @@ -182,30 +180,33 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { button(UIConstants.FINISH_BUTTON).click(); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openProject(java.lang.String) */ public void openProject(String projectName) { - SWTBotTreeItem treeItem = selectInProjectExplorer(projectName); + final SWTBotTreeItem treeItem = selectInProjectExplorer(projectName); SWTBotHelper.clickContextMenu(treeItem, UIConstants.OPEN_PROJECT_MENU); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#closeProject(java.lang.String) */ public void closeProject(String projectName) { - SWTBotTreeItem treeItem = selectInProjectExplorer(projectName); + final SWTBotTreeItem treeItem = selectInProjectExplorer(projectName); SWTBotHelper.clickContextMenu(treeItem, UIConstants.CLOSE_PROJECT_MENU); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#removeProject(java.lang.String) */ public void removeProject(String projectName) { - SWTBotTreeItem treeItem = selectInProjectExplorer(projectName); + final SWTBotTreeItem treeItem = selectInProjectExplorer(projectName); SWTBotHelper.clickContextMenu(treeItem, UIConstants.DELETE_MENU); checkBox().select(); button(UIConstants.OK_BUTTON).click(); @@ -213,13 +214,14 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { sleep(3000); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openPerspective(java.lang.String) */ public void openPerspective(String name) { menu(UIConstants.WINDOW_MENU).menu(UIConstants.OPEN_PERSPECTIVE_MENU).menu(UIConstants.OTHER_MENU).click(); - SWTBotShell openPerspectiveShell = shell(UIConstants.OPEN_PERSPECTIVE_MENU); + final SWTBotShell openPerspectiveShell = shell(UIConstants.OPEN_PERSPECTIVE_MENU); activateShell(openPerspectiveShell); try { @@ -231,18 +233,19 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#openEEFEditor(java.lang.String) */ public void openEEFEditor(String path) { - SWTBotTreeItem treeItem = selectInProjectExplorer(path); + final SWTBotTreeItem treeItem = selectInProjectExplorer(path); SWTBotHelper.clickContextMenu(treeItem, UIConstants.INTERACTIVE_EEF_EDITOR_MENU); } private SWTBotTreeItem selectInProjectExplorer(String path) { - SWTBotTree wizardTree = viewByTitle(UIConstants.PACKAGE_EXPLORER_VIEW_NAME).bot().tree(); - String[] split = path.split("/"); + final SWTBotTree wizardTree = viewByTitle(UIConstants.PACKAGE_EXPLORER_VIEW_NAME).bot().tree(); + final String[] split = path.split("/"); SWTBotTreeItem treeItem = wizardTree.expandNode(split[0]).select(); for (int i = 1; i < split.length; i++) { treeItem = treeItem.expandNode(split[i]).select(); @@ -250,8 +253,9 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { return treeItem; } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#closeEditor(java.lang.String) */ public void closeEditor(String path) { @@ -259,8 +263,9 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { menu(UIConstants.FILE_MENU).menu(UIConstants.CLOSE_MENU).click(); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#save() */ public void save() { @@ -269,11 +274,15 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { menu(UIConstants.FILE_MENU).menu(UIConstants.SAVE_MENU).click(); } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#add(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EClass) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#add(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * org.eclipse.emf.ecore.EClass) */ - public EObject add(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, final EStructuralFeature eContainingFeature, EClass type) { + public EObject add(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + final EStructuralFeature eContainingFeature, EClass type) { if (propertiesEditionElement != null) { // work on table composition return add(propertiesEditionElement, referenceableObject); @@ -285,7 +294,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Add PropertiesEditionElement + * Add PropertiesEditionElement. * * @param propertiesEditionElement * @param referenceableObject @@ -294,7 +303,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { private EObject add(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject) { SWTBotHelper.waitAllUiEvents(); assertNotNull("The editeur is not opened.", editor); - EObject container = getEObjectFromReferenceableEObject(referenceableObject); + final EObject container = getEObjectFromReferenceableEObject(referenceableObject); assertNotNull("No container is found to launch wizard.", container); SWTBotHelper.waitAllUiEvents(); final SWTBotTreeItem selectNode = selectNode(editor, container); @@ -303,11 +312,11 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { assertFalse("The set action must be define in a sequence.", sequenceType == null); propertiesEdition.addFeature(selectNode, propertiesEditionElement, sequenceType); SWTBotHelper.waitAllUiEvents(); - return (EObject) EEFModelHelper.eGet(container, propertiesEditionElement.getModel()); + return (EObject)EEFModelHelper.eGet(container, propertiesEditionElement.getModel()); } /** - * Add ReferenceableObject + * Add ReferenceableObject. * * @param referenceableObject * @param eContainingFeature @@ -317,16 +326,18 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { assertNotNull("The editeur is not opened.", editor); final EObject container = getEObjectFromReferenceableEObject(referenceableObject); assertNotNull("No container is found to launch add action.", container); - SWTBotTreeItem selectNode = selectNode(editor, container); + final SWTBotTreeItem selectNode = selectNode(editor, container); assertNotNull("No element is selected in the editor", selectNode); SWTBotHelper.clickContextMenu(selectNode, eContainingFeature.getEType().getName()); SWTBotHelper.waitAllUiEvents(); - return (EObject) EEFModelHelper.eGet(container, eContainingFeature); + return (EObject)EEFModelHelper.eGet(container, eContainingFeature); } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#remove(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#remove(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject) */ public void remove(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject) { if (propertiesEditionElement != null) { @@ -339,17 +350,18 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Remove propertiesEditionElement + * Remove propertiesEditionElement. * * @param propertiesEditionElement * @param referenceableObject */ - private void removePropertiesEditionElement(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject) { + private void removePropertiesEditionElement(PropertiesEditionElement propertiesEditionElement, + ReferenceableObject referenceableObject) { SWTBotHelper.waitAllUiEvents(); assertNotNull("The editeur is not opened.", editor); - EObject remove = getEObjectFromReferenceableEObject(referenceableObject); + final EObject remove = getEObjectFromReferenceableEObject(referenceableObject); assertNotNull("Element to remove does not exist.", remove); - EObject container = remove.eContainer(); + final EObject container = remove.eContainer(); assertNotNull("The container of the element to remove does not exist.", container); SWTBotHelper.waitAllUiEvents(); final SWTBotTreeItem selectNode = selectNode(editor, container); @@ -361,7 +373,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Remove referenceableObject + * Remove referenceableObject. * * @param referenceableObject */ @@ -369,21 +381,25 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { assertNotNull("The editeur is not opened.", editor); final EObject container = getEObjectFromReferenceableEObject(referenceableObject); assertNotNull("No container is found to launch add action.", container); - SWTBotTreeItem selectNode = selectNode(editor, container); + final SWTBotTreeItem selectNode = selectNode(editor, container); assertNotNull("No element is selected in the editor", selectNode); SWTBotHelper.clickContextMenu(selectNode, UIConstants.DELETE_MENU); SWTBotHelper.waitAllUiEvents(); } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.String) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * java.lang.String) */ - public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, String value) { + public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, String value) { SWTBotHelper.waitAllUiEvents(); assertNotNull("The properties edition element is not set.", propertiesEditionElement); assertNotNull("The editeur is not opened.", editor); - EObject container = getEObjectFromReferenceableEObject(referenceableObject); + final EObject container = getEObjectFromReferenceableEObject(referenceableObject); assertNotNull("No container is found to launch add action.", container); SWTBotHelper.waitAllUiEvents(); assertFalse("The set action must be define in a sequence.", sequenceType == null); @@ -398,7 +414,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Select the tab defined in the PEE + * Select the tab defined in the PEE. * * @param propertiesEditionElement * PropertiesEditionElement @@ -406,8 +422,8 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { protected void initTab(PropertiesEditionElement propertiesEditionElement) { assertFalse(propertiesEditionElement.getViews().isEmpty()); if (EEFModelHelper.getComponent(propertiesEditionElement).getViews().size() > 1) { - ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); - View view = EEFModelHelper.getView(elementEditor); + final ElementEditor elementEditor = propertiesEditionElement.getViews().get(0); + final View view = EEFModelHelper.getView(elementEditor); if (view.getName() != null) { cTabItem(view.getName()).activate(); cTabItem(view.getName()).setFocus(); @@ -415,43 +431,53 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.eef.extended.editor.ReferenceableObject) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#set(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject) */ - public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature, ReferenceableObject value) { + public void set(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature, ReferenceableObject value) { // TODO Auto-generated method stub } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#unset(org.eclipse.emf.eef.components.PropertiesEditionElement, org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#unset(org.eclipse.emf.eef.components.PropertiesEditionElement, + * org.eclipse.emf.eef.extended.editor.ReferenceableObject, org.eclipse.emf.ecore.EStructuralFeature) */ - public void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature) { + public void unset(PropertiesEditionElement propertiesEditionElement, ReferenceableObject referenceableObject, + EStructuralFeature eContainingFeature) { set(propertiesEditionElement, referenceableObject, eContainingFeature, ""); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#runModelingBot(java.lang.String) */ public void runModelingBot(String path) throws CoreException, IOException { interpreter.runModelingBot(path); } -/** - * {@inheritDoc) - * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createModel(java.lang.String, java.lang.String, org.eclipse.emf.ecore.EClass) + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.eef.modelingBot.IModelingBot#createModel(java.lang.String, java.lang.String, + * org.eclipse.emf.ecore.EClass) */ public EObject createModel(String path, String modelName, EClass root) { - String[] split = modelName.split("\\."); + final String[] split = modelName.split("\\."); final String extension = split[split.length - 1]; selectInProjectExplorer(path); menu(UIConstants.FILE_MENU).menu(UIConstants.OTHER_MENU).click(); - SWTBotShell newFileShell = shell(UIConstants.NEW); + final SWTBotShell newFileShell = shell(UIConstants.NEW); activateShell(newFileShell); createModel(modelName, root, extension); @@ -472,12 +498,12 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { * @return the root of the new resource */ private EObject getRoot(String path, String modelName) { - URI fileURI = URI.createPlatformResourceURI(path + "/" + modelName, true); + final URI fileURI = URI.createPlatformResourceURI(path + "/" + modelName, true); Resource resource = editingDomain.getResourceSet().getResource(fileURI, true); setTestModelResource(resource); final SWTBotTreeItem modelTreeItem = editor.bot().tree().getTreeItem(testModelResource.getURI().toString()); - resource = (Resource) syncExec(new Result<Object>() { + resource = (Resource)syncExec(new Result<Object>() { public Object run() { return modelTreeItem.widget.getData(); @@ -489,32 +515,32 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Open eef editor + * Open eef editor. * * @param path * @param modelName */ private void openWithEEFEditor(String path, String modelName) { - SWTBotTree wizardTree = viewByTitle(UIConstants.PACKAGE_EXPLORER_VIEW_NAME).bot().tree(); - SWTBotTreeItem treeItem = wizardTree.expandNode(path).expandNode(modelName).select(); + final SWTBotTree wizardTree = viewByTitle(UIConstants.PACKAGE_EXPLORER_VIEW_NAME).bot().tree(); + final SWTBotTreeItem treeItem = wizardTree.expandNode(path).expandNode(modelName).select(); SWTBotHelper.clickContextMenu(treeItem, UIConstants.OPEN_WITH_INTERACTIVE_EEF_EDITOR_MENU); } /** - * Create the new model + * Create the new model. * * @param modelName * @param root * @param extension */ private void createModel(String modelName, EClass root, final String extension) { - String modelType = StringHelper.toU1Case(extension) + " Model"; - SWTBotTreeItem item = tree().expandNode("EMF Editing Framework").expandNode("EMF Model").select(); + final String modelType = StringHelper.toU1Case(extension) + " Model"; + final SWTBotTreeItem item = tree().expandNode("EMF Editing Framework").expandNode("EMF Model").select(); assertNotNull("The model " + modelType + " can not be created.", item); button(UIConstants.NEXT_BUTTON).click(); button("Browse Registered Packages...").click(); - String nsURI = interpreter.getPropertiesEditionContext().getModel().getEcorePackage().getNsURI(); + final String nsURI = interpreter.getPropertiesEditionContext().getModel().getEcorePackage().getNsURI(); table().getTableItem(nsURI).select(); button(UIConstants.OK_BUTTON).click(); button(UIConstants.NEXT_BUTTON).click(); @@ -537,7 +563,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Select the given element in the given editor + * Select the given element in the given editor. * * @param editor * the editor where the bot must process @@ -547,8 +573,8 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { */ public SWTBotTreeItem selectNode(SWTBotEditor editor, EObject element) { assertNotNull("The model has not been initialized.", testModelResource); - List<Object> expansionPath = EEFModelHelper.getExpansionPath(element); - Iterator<Object> iterator = expansionPath.iterator(); + final List<Object> expansionPath = EEFModelHelper.getExpansionPath(element); + final Iterator<Object> iterator = expansionPath.iterator(); Object next = null; SWTBotTreeItem node2 = editor.bot().tree().getTreeItem(testModelResource.getURI().toString()); while (iterator.hasNext()) { @@ -561,7 +587,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Select the given element in the given editor + * Select the given element in the given editor. * * @param editor * the editor where the bot must process @@ -571,8 +597,8 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { */ public SWTBotTreeItem selectNode(SWTBotTree tree, EObject element) { assertNotNull("The model has not been initialized.", testModelResource); - List<Object> expansionPath = EEFModelHelper.getExpansionPath(element); - Iterator<Object> iterator = expansionPath.iterator(); + final List<Object> expansionPath = EEFModelHelper.getExpansionPath(element); + final Iterator<Object> iterator = expansionPath.iterator(); Object next = null; SWTBotTreeItem node2 = tree.getTreeItem(testModelResource.getURI().toString()); while (iterator.hasNext()) { @@ -584,8 +610,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Select the object <code>next</code> as a subnode of the - * <code>currentNode</code> + * Select the object <code>next</code> as a subnode of the <code>currentNode</code>. * * @param currentNode * the currentNode @@ -594,10 +619,11 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { * @return the selected node */ private SWTBotTreeItem selectSubNode(SWTBotTreeItem currentNode, Object next) { - AdapterFactory adapterFactory = EEFRuntimePlugin.getDefault().getAdapterFactory(); - IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(next, IItemLabelProvider.class); - String text = labelProvider.getText(next); - SWTBotTreeItem node2 = currentNode.getNode(text); + final AdapterFactory adapterFactory = EEFRuntimePlugin.getDefault().getAdapterFactory(); + final IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(next, + IItemLabelProvider.class); + final String text = labelProvider.getText(next); + final SWTBotTreeItem node2 = currentNode.getNode(text); node2.select(); return node2; } @@ -612,8 +638,9 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { this.testModelResource = resource; } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#getActiveResource() */ public Resource getActiveResource() { @@ -629,8 +656,9 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { return helper.addButtonAdvancedTableComposition(viewID); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#cancel() */ public void cancel() { @@ -644,16 +672,18 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { interpreter.dispose(); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#validateBatchEditing() */ public void validateBatchEditing() { button(UIConstants.FINISH_BUTTON).click(); } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#setSequenceType(org.eclipse.emf.eef.modelingBot.SequenceType) */ public void setSequenceType(SequenceType sequenceType) { @@ -670,7 +700,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { } /** - * Select the object in the advanced table composition + * Select the object in the advanced table composition. * * @param eefWidgetIdKey * widget key @@ -680,8 +710,8 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { * object to select */ public void selectInTableWithId(String eefWidgetIdKey, String qualifiedIdentifier, EObject selected) { - SWTBotTable table = tableWithId(eefWidgetIdKey, qualifiedIdentifier); - SWTBotTableItem tableItem = getTableItem(table, selected); + final SWTBotTable table = tableWithId(eefWidgetIdKey, qualifiedIdentifier); + final SWTBotTableItem tableItem = getTableItem(table, selected); assertNotNull("No table item is found.", tableItem); tableItem.select(); } @@ -694,7 +724,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { private SWTBotTableItem getTableItem(SWTBotTable table, EObject object) { for (int i = 0; i < table.rowCount(); i++) { final SWTBotTableItem tableItem = table.getTableItem(i); - Object data = syncExec(new Result<Object>() { + final Object data = syncExec(new Result<Object>() { public Object run() { return tableItem.widget.getData(); @@ -707,16 +737,18 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot { return null; } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#check() */ public void check() { } -/** - * {@inheritDoc) + /** + * {@inheritDoc} + * * @see org.eclipse.emf.eef.modelingBot.IModelingBot#getModelingBotInterpreter() */ public IModelingBotInterpreter getModelingBotInterpreter() { diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/ComposedEEFBotModelingTestCase.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/ComposedEEFBotModelingTestCase.java deleted file mode 100644 index 5ea05db83..000000000 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/ComposedEEFBotModelingTestCase.java +++ /dev/null @@ -1,95 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Obeo. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ -package org.eclipse.emf.eef.modelingBot.testcase; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.emf.eef.modelingBot.IModelingBot; -import org.eclipse.emf.eef.modelingBot.batch.BatchModelingBot; -import org.eclipse.emf.eef.modelingBot.helper.SWTBotHelper; -import org.eclipse.emf.eef.modelingBot.swtbot.ComposedEEFBot; -import org.eclipse.emf.eef.modelingBot.swtbot.SWTEEFBot; -import org.eclipse.swtbot.eclipse.finder.SWTBotEclipseTestCase; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; -import org.eclipse.ui.PlatformUI; -import org.junit.Before; - -/** - * SwtBot modeling test case with SWTEEFBot. - * - * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * - */ -public abstract class ComposedEEFBotModelingTestCase extends SWTBotEclipseTestCase { - - /** - * An instance of composed bot. - * - */ - protected ComposedEEFBot composedBot; - /** - * An instance of swt eef not. - */ - private SWTEEFBot swtEEFBot; - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - super.setUp(); - PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { - - public void run() { - PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell().setFullScreen(true); - } - }); - - List<IModelingBot> bots = new ArrayList<IModelingBot>(2); - swtEEFBot = new SWTEEFBot(); - swtEEFBot.closeWelcomePage(); - swtEEFBot.openJavaPerspective(); - swtEEFBot.openPropertiesView(); - BatchModelingBot batchModeling = new BatchModelingBot(); - bots.add(swtEEFBot); - bots.add(batchModeling); - composedBot = new ComposedEEFBot(bots); - } - - @Override - protected void tearDown() throws Exception { - // Close an eventual popup if the test failed and a popup remain opened - final SWTBotShell[] foundShells = bot.shells(); - for (final SWTBotShell swtBotShell : foundShells) { - // Close all opened windows except Eclipse - if (swtBotShell.isOpen() && !swtBotShell.getText().endsWith("Eclipse SDK") && !swtBotShell.getText().endsWith("Eclipse Platform")) { - swtBotShell.close(); - } - } - - SWTBotHelper.waitAllUiEvents(); - - swtEEFBot.closeAllEditors(); - swtEEFBot.dispose(); - - SWTBotHelper.waitAllUiEvents(); - - super.tearDown(); - } - - /** - * Test method : call bot.runModelingBot("test/model/My.modelingbot"); - * - * @throws Exception - */ - public abstract void testModelingBot() throws Exception; -} diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/SWTBotModelingBotTestCase.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/SWTBotModelingBotTestCase.java deleted file mode 100644 index 3131742b8..000000000 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/SWTBotModelingBotTestCase.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Obeo. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ -package org.eclipse.emf.eef.modelingBot.testcase; - -import org.eclipse.emf.eef.modelingBot.swtbot.SWTEEFBot; -import org.eclipse.swtbot.eclipse.finder.SWTBotEclipseTestCase; -import org.eclipse.ui.PlatformUI; -import org.junit.Before; - -/** - * SwtBot modeling test case with SWTEEFBot. - * - * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a> - * - */ -public abstract class SWTBotModelingBotTestCase extends SWTBotEclipseTestCase { - - /** - * An instance of SWTEclipseBot. - * - */ - protected SWTEEFBot bot = new SWTEEFBot(); - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - super.setUp(); - PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { - - public void run() { - PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell().setFullScreen(true); - } - }); - bot.closeWelcomePage(); - bot.openJavaPerspective(); - bot.openPropertiesView(); - } - - @Override - protected void tearDown() throws Exception { - // Close an eventual popup if the test failed and a popup remain opened - // final SWTBotShell[] foundShells = bot.shells(); - // for (final SWTBotShell swtBotShell : foundShells) { - // // Close all opened windows except Eclipse - // if (swtBotShell.isOpen() && - // !swtBotShell.getText().endsWith("Eclipse SDK") && - // !swtBotShell.getText().endsWith("Eclipse Platform")) { - // swtBotShell.close(); - // } - // } - // - // SWTBotUtils.waitAllUiEvents(); - // - // bot.closeAllEditors(); - // bot.dispose(); - // - // SWTBotUtils.waitAllUiEvents(); - - super.tearDown(); - } - - /** - * Test method : call bot.runModelingBot("test/model/My.modelingbot"); - * - * @throws Exception - */ - public abstract void testModelingBot() throws Exception; -} diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java index 0800c1531..88a452f80 100644..100755 --- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java +++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java @@ -45,11 +45,11 @@ public class EEFURIConverter extends ExtensibleURIConverterImpl { public URI normalize(URI uri) { URI result = super.normalize(uri); if (result.isPlatformResource()) { - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(result.toPlatformString(true))); + final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(result.toPlatformString(true))); if (!file.isAccessible()) { - URI pluginURI = URI.createPlatformPluginURI(uri.toPlatformString(true), true); + final URI pluginURI = URI.createPlatformPluginURI(uri.toPlatformString(true), true); try { - Resource resource = myResourceSet.getResource(pluginURI, true); + final Resource resource = myResourceSet.getResource(pluginURI, true); resource.load(Collections.EMPTY_MAP); if (resource.getContents() != null && !resource.getContents().isEmpty()) { result = pluginURI; diff --git a/tests/org.eclipse.emf.examples.eef.edit/.gitignore b/tests/org.eclipse.emf.examples.eef.edit/.gitignore index ba077a403..4058d0f36 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/.gitignore +++ b/tests/org.eclipse.emf.examples.eef.edit/.gitignore @@ -1 +1,2 @@ bin +/target diff --git a/tests/org.eclipse.emf.examples.eef.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.examples.eef.edit/META-INF/MANIFEST.MF index 21740c297..706aafc1e 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.examples.eef.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.eef.edit;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.samples.conference.provider.ConferenceEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/tests/org.eclipse.emf.examples.eef.edit/build.properties b/tests/org.eclipse.emf.examples.eef.edit/build.properties index d623e5869..af7890e13 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/build.properties +++ b/tests/org.eclipse.emf.examples.eef.edit/build.properties @@ -8,7 +8,8 @@ bin.includes = .,\ icons/,\ META-INF/,\ plugin.xml,\ - plugin.properties + plugin.properties,\ + models/ jars.compile.order = . source.. = src-gen/ output.. = bin/ diff --git a/tests/org.eclipse.emf.examples.eef.editor/.gitignore b/tests/org.eclipse.emf.examples.eef.editor/.gitignore index ba077a403..4058d0f36 100644 --- a/tests/org.eclipse.emf.examples.eef.editor/.gitignore +++ b/tests/org.eclipse.emf.examples.eef.editor/.gitignore @@ -1 +1,2 @@ bin +/target diff --git a/tests/org.eclipse.emf.examples.eef.editor/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.examples.eef.editor/META-INF/MANIFEST.MF index 05aa90c60..22ef18cdb 100644 --- a/tests/org.eclipse.emf.examples.eef.editor/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.examples.eef.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.eef.editor;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.samples.conference.presentation.ConferenceEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore b/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore index 97200ca0c..7bec85d19 100644 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore +++ b/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore @@ -1,2 +1,4 @@ bin *Local.launch +/screenshots +/target diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF index 6b5b16be6..9760e47db 100644 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF @@ -2,13 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: test Bundle-SymbolicName: org.eclipse.emf.examples.eef.tests.junit -Bundle-Version: 1.0.0 +Bundle-Version: 2.0.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, + org.eclipse.jdt.ui, org.eclipse.emf.eef.runtime.tests, org.eclipse.emf.examples.eef.edit, - org.junit4, - org.eclipse.emf.eef.modelingbot.edit + org.eclipse.emf.eef.modelingbot.editor, + org.eclipse.swtbot.go, + org.apache.log4j, + org.eclipse.emf.examples.eef.editor +Eclipse-RegisterBuddy: org.apache.log4j Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.emf.samples.conference.tests.junit diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch b/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch index 93cc8e2e7..14989193b 100644 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch +++ b/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> <booleanAttribute key="askclear" value="false"/> <booleanAttribute key="automaticAdd" value="true"/> <booleanAttribute key="automaticValidate" value="false"/> diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot deleted file mode 100644 index 80e00c245..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0"> - <propertiesEditionContext href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/> - <sequences xsi:type="eef-mbot:Scenario" name="Site" documentation="Test Site PropertiesEditingComponent"> - <processings xsi:type="eef-test:CreateProject" name="test project" documentation="Create the test project" projectName="conference_Site"/> - <processings xsi:type="eef-test:CreateModel" name="test model" documentation="Create the test model" modelName="test_Site.conference" path="conference_Site"> - <root href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/> - </processings> - <processings xsi:type="eef-mbot:DetailsPage"> - <processings xsi:type="eef-test_1:Add" name="site to test" documentation="Create the site to test" referenceableObject="//@sequences.0/@processings.1"> - <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Site"/> - <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/sites"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="name - value 'Site1'" documentation="Set the value 'Site1' to the name of the Site" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="Site1"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBPJkmEd6sxtwdpecy3w"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - </processings> - <processings xsi:type="eef-test:Save"/> - <processings xsi:type="eef-test:RemoveProject" name="test project" documentation="Deletre the test project" projectName="conference_Site"/> - </sequences> -</eef-mbot:ModelingBot> diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot deleted file mode 100644 index 2d2961065..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0"> - <propertiesEditionContext href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/> - <sequences xsi:type="eef-mbot:Scenario"> - <processings xsi:type="eef-test:CreateProject" name="TestText" projectName="TestText"/> - <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestText"> - <root href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/> - </processings> - <processings xsi:type="eef-mbot:DetailsPage"> - <processings xsi:type="eef-test_1:Add" name="participant" documentation="" referenceableObject="//@sequences.0/@processings.1"> - <type href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> - <eContainingFeature xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my first name"> - <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my other first name (yes because i have two first names)"> - <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-mbot:DetailsPage"> - <processings xsi:type="eef-test_1:Unset" name="name" referenceableObject="//@sequences.0/@processings.2/@processings.0"> - <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <feature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my other first name (yes because i have two first names)"> - <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test_1:Unset" name="name" referenceableObject="//@sequences.0/@processings.2/@processings.0"> - <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <feature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-mbot:DetailsPage" name=""> - <processings xsi:type="eef-test_1:Remove" name="participant" referenceableObject="//@sequences.0/@processings.2/@processings.0"/> - <processings xsi:type="eef-test:Save"/> - <processings xsi:type="eef-test_1:Add" name="participant2" documentation="" referenceableObject="//@sequences.0/@processings.1"> - <type href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> - <eContainingFeature xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:Remove" name="participant" referenceableObject="//@sequences.0/@processings.8/@processings.2"/> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-test:RemoveProject" name="TestText" projectName="TestText"/> - </sequences> -</eef-mbot:ModelingBot> diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot deleted file mode 100644 index fcbe6d392..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0"> - <propertiesEditionContext href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/> - <sequences xsi:type="eef-mbot:Scenario"> - <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/> - <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestTableCompo"> - <root href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-mbot:DetailsPage"> - <processings xsi:type="eef-test_1:Add" name="participant3" documentation="" referenceableObject="//@sequences.0/@processings.1"> - <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> - <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.3/@processings.0" value="my first name"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test_1:Add" name="site3" referenceableObject="//@sequences.0/@processings.1"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_P9i7gJktEd6sxtwdpecy3w"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="site name" referenceableObject="//@sequences.0/@processings.3/@processings.2" value="My site"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_0lme4Bi5EeCOk6BuQTSdWA"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="site doc" referenceableObject="//@sequences.0/@processings.3/@processings.2" value="My site"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBNZkmEd6sxtwdpecy3w"/> - </processings> - <processings xsi:type="eef-test_1:Add" name="room" documentation="" referenceableObject="//@sequences.0/@processings.3/@processings.2"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="name" referenceableObject="//@sequences.0/@processings.3/@processings.3/@processings.2" value="Room1"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_O_1wYG3dEeC0ELVFaUipLQ"/> - </processings> - </processings> - <processings xsi:type="eef-test_1:Remove" name="room" referenceableObject="//@sequences.0/@processings.3/@processings.3/@processings.2"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/> - </processings> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/> - </sequences> -</eef-mbot:ModelingBot> diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot deleted file mode 100644 index a1d3e71dc..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0"> - <propertiesEditionContext href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/> - <sequences xsi:type="eef-mbot:Scenario"> - <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/> - <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestTableCompo"> - <root href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/> - </processings> - <processings xsi:type="eef-mbot:DetailsPage"> - <processings xsi:type="eef-test_1:Add" name="participant" documentation="" referenceableObject="//@sequences.0/@processings.1"> - <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> - <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my first name"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test_1:Add" name="site" referenceableObject="//@sequences.0/@processings.1"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_P9i7gJktEd6sxtwdpecy3w"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="site name" referenceableObject="//@sequences.0/@processings.2/@processings.2" value="My site"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_0lme4Bi5EeCOk6BuQTSdWA"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="site doc" referenceableObject="//@sequences.0/@processings.2/@processings.2" value="My site"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBNZkmEd6sxtwdpecy3w"/> - </processings> - <processings xsi:type="eef-test_1:Add" name="participant2" documentation="" referenceableObject="//@sequences.0/@processings.2/@processings.2"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="room1" referenceableObject="//@sequences.0/@processings.2/@processings.3/@processings.2" value="my second first name"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_O_1wYG3dEeC0ELVFaUipLQ"/> - </processings> - </processings> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-mbot:DetailsPage"> - <processings xsi:type="eef-test_1:Add" name="participant3" documentation="" referenceableObject="//@sequences.0/@processings.1"> - <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> - <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.4/@processings.0" value="my first name"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test_1:Add" name="site3" referenceableObject="//@sequences.0/@processings.1"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_P9i7gJktEd6sxtwdpecy3w"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="site name" referenceableObject="//@sequences.0/@processings.4/@processings.2" value="My site"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_0lme4Bi5EeCOk6BuQTSdWA"/> - </processings> - <processings xsi:type="eef-test_1:SetAttribute" name="site doc" referenceableObject="//@sequences.0/@processings.4/@processings.2" value="My site"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBNZkmEd6sxtwdpecy3w"/> - </processings> - <processings xsi:type="eef-test_1:Add" name="participant2" documentation="" referenceableObject="//@sequences.0/@processings.4/@processings.2"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/> - </processings> - <processings xsi:type="eef-mbot:Wizard"> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.4/@processings.3/@processings.2" value="my second first name"> - <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test_1:Cancel"/> - </processings> - <processings xsi:type="eef-test_1:Cancel"/> - </processings> - <processings xsi:type="eef-test:Save"/> - </processings> - <processings xsi:type="eef-test:CloseEditor" path="TestTableCompo/test.conference"/> - <processings xsi:type="eef-test:CloseProject" projectName="TestTableCompo"/> - <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/> - </sequences> - <sequences xsi:type="eef-mbot:Scenario"> - <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/> - <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/> - </sequences> -</eef-mbot:ModelingBot> diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot deleted file mode 100644 index 92334f2e8..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0"> - <propertiesEditionContext href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/> - <sequences xsi:type="eef-mbot:Scenario"> - <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/> - <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestTableCompo"> - <root href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-mbot:DetailsPage"> - <processings xsi:type="eef-test_1:Add" name="participant3" documentation="" referenceableObject="//@sequences.0/@processings.1"> - <type href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/> - <eContainingFeature xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.3/@processings.0" value="my first name"> - <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/> - <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - </processings> - <processings xsi:type="eef-test_1:Check"/> - <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/> - </sequences> -</eef-mbot:ModelingBot> diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java index aac3435f8..923c0e07d 100644 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java +++ b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java @@ -1,24 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2008, 2012 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ package org.eclipse.emf.samples.conference.tests.junit; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.ComposedBotModelingTestCase; -import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.SWTBotModelingTestCase; -import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.SWTBotModelingTestCase2; -import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.SWTBotModelingTestCase3; +import org.eclipse.emf.samples.conference.tests.junit.modelingbot.ComposedBotModelingTestCase; +import org.eclipse.emf.samples.conference.tests.junit.modelingbot.ConferenceModelingBotTestCase; +import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SWTBotModelingTestCase; +import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SWTBotModelingTestCase2; +import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SWTBotModelingTestCase3; +import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SiteModelingBotTestCase; public class AllModelingBotTests { public static Test suite() { - TestSuite suite = new TestSuite( - "Test for modeling bot on Conference"); - //$JUnit-BEGIN$ + TestSuite suite = new TestSuite("Test for modeling bot on Conference"); + // $JUnit-BEGIN$ + suite.addTestSuite(ConferenceModelingBotTestCase.class); + suite.addTestSuite(SiteModelingBotTestCase.class); + suite.addTestSuite(ComposedBotModelingTestCase.class); + suite.addTestSuite(SWTBotModelingTestCase.class); suite.addTestSuite(SWTBotModelingTestCase2.class); suite.addTestSuite(SWTBotModelingTestCase3.class); - suite.addTestSuite(SWTBotModelingTestCase.class); - suite.addTestSuite(ComposedBotModelingTestCase.class); - //$JUnit-END$ + // $JUnit-END$ return suite; } diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java index bffc16168..54d07c1a7 100644 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java +++ b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2008, 2012 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ package org.eclipse.emf.samples.conference.tests.junit; import junit.framework.Test; @@ -6,15 +16,14 @@ import junit.framework.TestSuite; public class AllTests { public static Test suite() { - TestSuite suite = new TestSuite( - "Test for org.eclipse.emf.samples.conference.tests.junit"); - //$JUnit-BEGIN$ + TestSuite suite = new TestSuite("Test for org.eclipse.emf.samples.conference.tests.junit"); + // $JUnit-BEGIN$ suite.addTestSuite(TalkTestCase.class); suite.addTestSuite(ConferenceTestCase.class); suite.addTestSuite(SiteTestCase.class); suite.addTestSuite(TopicTestCase.class); suite.addTestSuite(PersonTestCase.class); - //$JUnit-END$ + // $JUnit-END$ return suite; } diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java index cf7668b0e..c04712f27 100644 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java +++ b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java @@ -1,22 +1,30 @@ -/** +/******************************************************************************* + * Copyright (c) 2008, 2012 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html * - */ + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ package org.eclipse.emf.samples.conference.tests.junit.modelingbot; -import org.eclipse.emf.eef.modelingBot.testcase.ComposedEEFBotModelingTestCase; +import org.eclipse.emf.eef.modelingBot.testcase.AbstractEEFBotModelingTestCase; /** * @author <a href="goulwen.lefur@obeo.fr">Goulwen Le Fur</a> - * */ -public class SiteModelingBotTestCase extends ComposedEEFBotModelingTestCase { +public class SiteModelingBotTestCase extends AbstractEEFBotModelingTestCase { /** * {@inheritDoc} - * @see org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase#testModelingBot() + * + * @see org.eclipse.emf.eef.modelingBot.testcase.AbstractEEFBotModelingTestCase#testModelingBot() */ public void testModelingBot() throws Exception { - composedBot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot"); + composedBot + .runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/modelingbot/conference_Site.modelingbot"); } } diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/ComposedBotModelingTestCase.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/ComposedBotModelingTestCase.java deleted file mode 100644 index 47ed56ecf..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/ComposedBotModelingTestCase.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional; -/******************************************************************************* - * Copyright (c) 2011 Obeo. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ - - -/** - * @author nlepine - * - */ -public class ComposedBotModelingTestCase extends org.eclipse.emf.eef.modelingBot.testcase.ComposedEEFBotModelingTestCase { - public void testModelingBot() throws Exception { - composedBot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot"); - } - -} diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase.java deleted file mode 100644 index 2d48ea40d..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional; -/******************************************************************************* - * Copyright (c) 2011 Obeo. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ - - -/** - * @author nlepine - * - */ -public class SWTBotModelingTestCase extends org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase { - - public void testModelingBot() throws Exception { - bot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot"); - } - -} diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase2.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase2.java deleted file mode 100644 index 3bc2f6c10..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase2.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional; -/******************************************************************************* - * Copyright (c) 2011 Obeo. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ - - -/** - * @author nlepine - * - */ -public class SWTBotModelingTestCase2 extends org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase { - - public void testModelingBot() throws Exception { - bot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot"); - } - -} diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase3.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase3.java deleted file mode 100644 index 50fbdf8bb..000000000 --- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase3.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional; -/******************************************************************************* - * Copyright (c) 2011 Obeo. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ - - -/** - * @author nlepine - * - */ -public class SWTBotModelingTestCase3 extends org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase { - - public void testModelingBot() throws Exception { - bot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot"); - } - -} diff --git a/tests/org.eclipse.emf.examples.eef/.gitignore b/tests/org.eclipse.emf.examples.eef/.gitignore index ba077a403..4058d0f36 100644 --- a/tests/org.eclipse.emf.examples.eef/.gitignore +++ b/tests/org.eclipse.emf.examples.eef/.gitignore @@ -1 +1,2 @@ bin +/target diff --git a/tests/org.eclipse.emf.examples.eef/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.examples.eef/META-INF/MANIFEST.MF index 183ed2edc..dc21a3a4e 100644 --- a/tests/org.eclipse.emf.examples.eef/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.examples.eef/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.eef;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin |
